From 7a4c65c8bbf6bbeab71027f199a4ba91f21e52b5 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 19 Apr 2023 11:27:39 +0200 Subject: [PATCH 01/11] allow non-absolute paths as input for --create_complexity_tables --- scripts/pyivastest/IvasModeAnalyzer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/pyivastest/IvasModeAnalyzer.py b/scripts/pyivastest/IvasModeAnalyzer.py index fed4f29ecd..94e2646684 100644 --- a/scripts/pyivastest/IvasModeAnalyzer.py +++ b/scripts/pyivastest/IvasModeAnalyzer.py @@ -958,6 +958,7 @@ class IvasModeAnalyzer(IvasModeCollector): IvasModeAnalyzer.write_csv_file(filename, table) def all_instrumented_to_csv(self, basefilename, encdec=-1): + basefilename = os.path.abspath(basefilename) for value in INSTRUMENTED_RESULTS: table = self.get_instrumented_value(value, encdec=encdec) IvasModeAnalyzer.write_csv_file("".join([basefilename, "_", value]), table) -- GitLab From fcf570a7e9b99d3438b3426b6bf90dc0c2142058 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 19 Apr 2023 11:39:44 +0200 Subject: [PATCH 02/11] allow non-absolute paths for --metadata_files --- scripts/pyivastest/IvasScriptsCommon.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/pyivastest/IvasScriptsCommon.py b/scripts/pyivastest/IvasScriptsCommon.py index 3df9994170..681e6b1b7f 100644 --- a/scripts/pyivastest/IvasScriptsCommon.py +++ b/scripts/pyivastest/IvasScriptsCommon.py @@ -631,7 +631,8 @@ def runner_setup(runner, args): if args["item_list"]: runner.set_global_item_list(args["item_list"]) if args["metadata_files"]: - runner.set_global_metadata_file_list(args["metadata_files"]) + metadata_files = [os.path.abspath(f) for f in args["metadata_files"]] + runner.set_global_metadata_file_list(metadata_files) if args["decoder_only"]: runner.run_encoder = False if args["info"]: -- GitLab From 07a27b69eb2bbdade054497729ea53ff0eef82a6 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 17:59:08 +0200 Subject: [PATCH 03/11] pass metadata files explicitly in sanitzer tests --- ci/run_scheduled_sanitizer_test.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index aa6f2636a4..9886de4291 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -63,8 +63,7 @@ def main(args): assert all([t in SUPPORTED_TESTS for t in tests]) - modes = get_modes(in_format) - returncode = run_check(modes, out_formats, tests, run_fec=run_fec) + returncode = run_check(in_format, out_formats, tests, run_fec=run_fec) collect_for_sanitizer_test(CONSOLE_OUT_FILE) @@ -92,7 +91,22 @@ def get_modes(in_format: str) -> list: return mode_list -def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True): +def get_md_file_command(in_format: str) -> list: + + cmd = list() + if in_format.startswith("ISM"): + cmd.append("--metadata_files") + md_filename = "/usr/local/ltv/ltvISM{}.csv" + n = int(in_format[-1]) + cmd.extend([md_filename.format(i) for i in range(1, n + 1)]) + + return cmd + + +def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = True): + + modes = get_modes(in_format) + md_file_command = get_md_file_command(in_format) ### always run encoder and decoder with no frameloss cmd_no_fec = [ @@ -107,6 +121,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) *modes, "--oc", *out_formats, + *md_file_command, ] print( -- GitLab From cd26ec4714e62995acfc878673b085adafbc583a Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 18:12:12 +0200 Subject: [PATCH 04/11] fix default input file name for MASA 2TC --- scripts/config/ci_linux.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config/ci_linux.json b/scripts/config/ci_linux.json index 6bca2663d9..1cb1141752 100644 --- a/scripts/config/ci_linux.json +++ b/scripts/config/ci_linux.json @@ -10,8 +10,8 @@ "SBA": "/usr/local/testv/stv3OA48c.wav", "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav", "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav", - "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav.wav", - "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav.wav", + "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav", + "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav", "5_1": "/usr/local/testv/stv51MC48c.wav", "5_1_2": "/usr/local/testv/stv512MC48c.wav", "5_1_4": "/usr/local/testv/stv514MC48c.wav", -- GitLab From 3a936be2722efee1f798e96a2a9bff7afd2eae14 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 18:16:24 +0200 Subject: [PATCH 05/11] explicitly pass metadata in smoke test --- ci/smoke_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index 2062ff5080..b40b8ae01b 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -55,6 +55,7 @@ fi cfg=./scripts/config/ci_linux.json dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat +ism_md_cmd="--metadata_files /usr/local/testv/stvISM+1.csv /usr/local/testv/stvISM+2.csv /usr/local/testv/stvISM+3.csv /usr/local/testv/stvISM+4.csv" if [ $BUILD -eq 1 ];then # Enable memory macros to find unbalanced memory allocations/deallocations @@ -74,7 +75,7 @@ if [ $BUILD -eq 1 ];then fi # run all modes vanilla-fashion -./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt +./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS $ism_md_cmd | tee smoke_test_output.txt # run the decoding again, but with 15% frame loss ./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt -- GitLab From 0595bfa3b33e2e213c8db18515c2bf658281c47e Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 18:17:36 +0200 Subject: [PATCH 06/11] change default ISM metadata file in ivas_modes.json --- scripts/config/ivas_modes.json | 16 +- scripts/config/ivas_modes_debug.json | 386 +++++++++++++-------------- 2 files changed, 201 insertions(+), 201 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 0e4ef469d9..127d7ffe58 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1813,7 +1813,7 @@ "table_name": "ISM1@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -1868,7 +1868,7 @@ "table_name": "ISM1@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -1924,7 +1924,7 @@ "table_name": "ISM2@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -1986,7 +1986,7 @@ "table_name": "ISM2@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -2049,7 +2049,7 @@ "table_name": "ISM3@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -2112,7 +2112,7 @@ "table_name": "ISM3@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -2176,7 +2176,7 @@ "table_name": "ISM4@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -2242,7 +2242,7 @@ "table_name": "ISM4@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, diff --git a/scripts/config/ivas_modes_debug.json b/scripts/config/ivas_modes_debug.json index 769ed791ea..01b5c4517d 100644 --- a/scripts/config/ivas_modes_debug.json +++ b/scripts/config/ivas_modes_debug.json @@ -12117,7 +12117,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12141,7 +12141,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12165,7 +12165,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12189,7 +12189,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12213,7 +12213,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12237,7 +12237,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12261,7 +12261,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12285,7 +12285,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12309,7 +12309,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12333,7 +12333,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12357,7 +12357,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12381,7 +12381,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12405,7 +12405,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12429,7 +12429,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12453,7 +12453,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12477,7 +12477,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12501,7 +12501,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12525,7 +12525,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12549,7 +12549,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12573,7 +12573,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12597,7 +12597,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12621,7 +12621,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12645,7 +12645,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12669,7 +12669,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12693,7 +12693,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12717,7 +12717,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12741,7 +12741,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12765,7 +12765,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12789,7 +12789,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12813,7 +12813,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12837,7 +12837,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12861,7 +12861,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12885,7 +12885,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12909,7 +12909,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12933,7 +12933,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12958,7 +12958,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -12983,7 +12983,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13008,7 +13008,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13033,7 +13033,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13058,7 +13058,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13083,7 +13083,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13108,7 +13108,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13133,7 +13133,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13158,7 +13158,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13183,7 +13183,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13208,7 +13208,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13233,7 +13233,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13258,7 +13258,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13283,7 +13283,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13308,7 +13308,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13333,7 +13333,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13358,7 +13358,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13383,7 +13383,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13408,7 +13408,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13433,7 +13433,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13458,7 +13458,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13483,7 +13483,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13508,7 +13508,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13533,7 +13533,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13558,7 +13558,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13583,7 +13583,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13608,7 +13608,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13633,7 +13633,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13658,7 +13658,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13683,7 +13683,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13708,7 +13708,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13733,7 +13733,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13758,7 +13758,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13783,7 +13783,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13808,7 +13808,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13833,7 +13833,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13858,7 +13858,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13884,7 +13884,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13908,7 +13908,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13932,7 +13932,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13956,7 +13956,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -13980,7 +13980,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14004,7 +14004,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14028,7 +14028,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14052,7 +14052,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14076,7 +14076,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14100,7 +14100,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14124,7 +14124,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14148,7 +14148,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14172,7 +14172,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14196,7 +14196,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14220,7 +14220,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14244,7 +14244,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14268,7 +14268,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14292,7 +14292,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14316,7 +14316,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14340,7 +14340,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14364,7 +14364,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14388,7 +14388,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14412,7 +14412,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14436,7 +14436,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14460,7 +14460,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14484,7 +14484,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14508,7 +14508,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14532,7 +14532,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14556,7 +14556,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14580,7 +14580,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14604,7 +14604,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14628,7 +14628,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14653,7 +14653,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14678,7 +14678,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14703,7 +14703,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14728,7 +14728,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14753,7 +14753,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14778,7 +14778,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14803,7 +14803,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14828,7 +14828,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14853,7 +14853,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14878,7 +14878,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14903,7 +14903,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14928,7 +14928,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14953,7 +14953,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -14978,7 +14978,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15003,7 +15003,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15028,7 +15028,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15053,7 +15053,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15078,7 +15078,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15103,7 +15103,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15128,7 +15128,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15153,7 +15153,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15178,7 +15178,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15203,7 +15203,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15228,7 +15228,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15253,7 +15253,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15278,7 +15278,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15303,7 +15303,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15328,7 +15328,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15353,7 +15353,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15378,7 +15378,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15403,7 +15403,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15428,7 +15428,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15454,7 +15454,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15478,7 +15478,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15502,7 +15502,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15526,7 +15526,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15550,7 +15550,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15574,7 +15574,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15598,7 +15598,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15622,7 +15622,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15646,7 +15646,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15670,7 +15670,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15694,7 +15694,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15718,7 +15718,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15742,7 +15742,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15766,7 +15766,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15790,7 +15790,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15814,7 +15814,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15838,7 +15838,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15862,7 +15862,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15886,7 +15886,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15910,7 +15910,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15934,7 +15934,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15958,7 +15958,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -15982,7 +15982,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16006,7 +16006,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16030,7 +16030,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16054,7 +16054,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16078,7 +16078,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16102,7 +16102,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16126,7 +16126,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16150,7 +16150,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16176,7 +16176,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16200,7 +16200,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16224,7 +16224,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16248,7 +16248,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16272,7 +16272,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16296,7 +16296,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16320,7 +16320,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16344,7 +16344,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16368,7 +16368,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16392,7 +16392,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16416,7 +16416,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16440,7 +16440,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16464,7 +16464,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16488,7 +16488,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16512,7 +16512,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16536,7 +16536,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16560,7 +16560,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16584,7 +16584,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16608,7 +16608,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16632,7 +16632,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16656,7 +16656,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16680,7 +16680,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16704,7 +16704,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16728,7 +16728,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16752,7 +16752,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16776,7 +16776,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, @@ -16800,7 +16800,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM+{mdi}.csv" ], "rs": false, "amr": false, -- GitLab From 564175177be959234587b7be33b0aff665fc345f Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 18:26:43 +0200 Subject: [PATCH 07/11] change metadata file names --- ci/smoke_test.sh | 2 +- scripts/config/ivas_modes.json | 16 +- scripts/config/ivas_modes_debug.json | 386 +++++++++++++-------------- 3 files changed, 202 insertions(+), 202 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index b40b8ae01b..f320b385e3 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -55,7 +55,7 @@ fi cfg=./scripts/config/ci_linux.json dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat -ism_md_cmd="--metadata_files /usr/local/testv/stvISM+1.csv /usr/local/testv/stvISM+2.csv /usr/local/testv/stvISM+3.csv /usr/local/testv/stvISM+4.csv" +ism_md_cmd="--metadata_files /usr/local/testv/stvISM1.csv /usr/local/testv/stvISM2.csv /usr/local/testv/stvISM3.csv /usr/local/testv/stvISM4.csv" if [ $BUILD -eq 1 ];then # Enable memory macros to find unbalanced memory allocations/deallocations diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 127d7ffe58..2f8d4ce398 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1813,7 +1813,7 @@ "table_name": "ISM1@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1868,7 +1868,7 @@ "table_name": "ISM1@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1924,7 +1924,7 @@ "table_name": "ISM2@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1986,7 +1986,7 @@ "table_name": "ISM2@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2049,7 +2049,7 @@ "table_name": "ISM3@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2112,7 +2112,7 @@ "table_name": "ISM3@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2176,7 +2176,7 @@ "table_name": "ISM4@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2242,7 +2242,7 @@ "table_name": "ISM4@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, diff --git a/scripts/config/ivas_modes_debug.json b/scripts/config/ivas_modes_debug.json index 01b5c4517d..bbd63d224c 100644 --- a/scripts/config/ivas_modes_debug.json +++ b/scripts/config/ivas_modes_debug.json @@ -12117,7 +12117,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12141,7 +12141,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12165,7 +12165,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12189,7 +12189,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12213,7 +12213,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12237,7 +12237,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12261,7 +12261,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12285,7 +12285,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12309,7 +12309,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12333,7 +12333,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12357,7 +12357,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12381,7 +12381,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12405,7 +12405,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12429,7 +12429,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12453,7 +12453,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12477,7 +12477,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12501,7 +12501,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12525,7 +12525,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12549,7 +12549,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12573,7 +12573,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12597,7 +12597,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12621,7 +12621,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12645,7 +12645,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12669,7 +12669,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12693,7 +12693,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12717,7 +12717,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12741,7 +12741,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12765,7 +12765,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12789,7 +12789,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12813,7 +12813,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12837,7 +12837,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12861,7 +12861,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12885,7 +12885,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12909,7 +12909,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12933,7 +12933,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12958,7 +12958,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12983,7 +12983,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13008,7 +13008,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13033,7 +13033,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13058,7 +13058,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13083,7 +13083,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13108,7 +13108,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13133,7 +13133,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13158,7 +13158,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13183,7 +13183,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13208,7 +13208,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13233,7 +13233,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13258,7 +13258,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13283,7 +13283,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13308,7 +13308,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13333,7 +13333,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13358,7 +13358,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13383,7 +13383,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13408,7 +13408,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13433,7 +13433,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13458,7 +13458,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13483,7 +13483,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13508,7 +13508,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13533,7 +13533,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13558,7 +13558,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13583,7 +13583,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13608,7 +13608,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13633,7 +13633,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13658,7 +13658,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13683,7 +13683,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13708,7 +13708,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13733,7 +13733,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13758,7 +13758,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13783,7 +13783,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13808,7 +13808,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13833,7 +13833,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13858,7 +13858,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13884,7 +13884,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13908,7 +13908,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13932,7 +13932,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13956,7 +13956,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13980,7 +13980,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14004,7 +14004,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14028,7 +14028,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14052,7 +14052,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14076,7 +14076,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14100,7 +14100,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14124,7 +14124,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14148,7 +14148,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14172,7 +14172,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14196,7 +14196,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14220,7 +14220,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14244,7 +14244,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14268,7 +14268,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14292,7 +14292,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14316,7 +14316,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14340,7 +14340,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14364,7 +14364,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14388,7 +14388,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14412,7 +14412,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14436,7 +14436,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14460,7 +14460,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14484,7 +14484,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14508,7 +14508,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14532,7 +14532,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14556,7 +14556,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14580,7 +14580,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14604,7 +14604,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14628,7 +14628,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14653,7 +14653,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14678,7 +14678,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14703,7 +14703,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14728,7 +14728,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14753,7 +14753,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14778,7 +14778,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14803,7 +14803,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14828,7 +14828,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14853,7 +14853,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14878,7 +14878,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14903,7 +14903,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14928,7 +14928,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14953,7 +14953,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14978,7 +14978,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15003,7 +15003,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15028,7 +15028,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15053,7 +15053,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15078,7 +15078,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15103,7 +15103,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15128,7 +15128,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15153,7 +15153,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15178,7 +15178,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15203,7 +15203,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15228,7 +15228,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15253,7 +15253,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15278,7 +15278,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15303,7 +15303,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15328,7 +15328,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15353,7 +15353,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15378,7 +15378,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15403,7 +15403,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15428,7 +15428,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15454,7 +15454,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15478,7 +15478,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15502,7 +15502,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15526,7 +15526,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15550,7 +15550,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15574,7 +15574,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15598,7 +15598,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15622,7 +15622,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15646,7 +15646,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15670,7 +15670,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15694,7 +15694,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15718,7 +15718,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15742,7 +15742,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15766,7 +15766,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15790,7 +15790,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15814,7 +15814,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15838,7 +15838,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15862,7 +15862,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15886,7 +15886,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15910,7 +15910,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15934,7 +15934,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15958,7 +15958,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15982,7 +15982,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16006,7 +16006,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16030,7 +16030,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16054,7 +16054,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16078,7 +16078,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16102,7 +16102,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16126,7 +16126,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16150,7 +16150,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16176,7 +16176,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16200,7 +16200,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16224,7 +16224,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16248,7 +16248,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16272,7 +16272,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16296,7 +16296,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16320,7 +16320,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16344,7 +16344,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16368,7 +16368,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16392,7 +16392,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16416,7 +16416,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16440,7 +16440,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16464,7 +16464,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16488,7 +16488,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16512,7 +16512,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16536,7 +16536,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16560,7 +16560,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16584,7 +16584,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16608,7 +16608,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16632,7 +16632,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16656,7 +16656,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16680,7 +16680,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16704,7 +16704,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16728,7 +16728,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16752,7 +16752,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16776,7 +16776,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16800,7 +16800,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "stvISM+{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, -- GitLab From 3013326c11e19bcb1d4eb51029fb3ac1df3d0237 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 18:44:15 +0200 Subject: [PATCH 08/11] add debug output for smoke test --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71ff18eb92..d02c7aa728 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -322,6 +322,7 @@ codec-smoke-test: - bash ci/smoke_test.sh ### analyze for failures - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi + - cat out/logs/tmp/masa_smoke/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi -- GitLab From e01a88ca7ec31d4c0571410f4f40737f9dc8c38a Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 20:14:10 +0200 Subject: [PATCH 09/11] move debug printout so that it actually will be printed -.- --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d02c7aa728..8ef339f6eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -321,8 +321,8 @@ codec-smoke-test: - *print-common-info - bash ci/smoke_test.sh ### analyze for failures - - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - cat out/logs/tmp/masa_smoke/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt + - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi -- GitLab From 13238e647aeb30bbd2747e9a55fbe59f5183c403 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 20:17:55 +0200 Subject: [PATCH 10/11] correct debug printout --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ef339f6eb..1074de71b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -321,7 +321,7 @@ codec-smoke-test: - *print-common-info - bash ci/smoke_test.sh ### analyze for failures - - cat out/logs/tmp/masa_smoke/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt + - cat out/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi -- GitLab From 91df3e0257ab25759878db00f2cb97b2fd507f9b Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 20 Apr 2023 20:29:38 +0200 Subject: [PATCH 11/11] run ism modes separately --- ci/smoke_test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index f320b385e3..852b74fe47 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -75,7 +75,11 @@ if [ $BUILD -eq 1 ];then fi # run all modes vanilla-fashion -./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS $ism_md_cmd | tee smoke_test_output.txt +# treat ISM modes separately because passing the metadata files to MASA modes causes crashes +ism_modes=$(./scripts/runIvasCodec.py -l | grep ISM) +non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ISM) +./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt +./scripts/runIvasCodec.py -m $ism_modes -p $cfg -U 1 $WORKERS $ism_md_cmd | tee smoke_test_output.txt # run the decoding again, but with 15% frame loss ./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt -- GitLab