Merge branch 'master' into update_davinci_test_files

python/MooreTests/extract_filesizes.py

@@ -23,7 +23,7 @@ def extract_filesizes(process, stream_config, streams):
     """
     fname_helper = FileNameHelper(process, stream_config)
     filesizes = {}
-    compression_cmd = 'zstd -f -5 {fpath}'
+    compression_cmd = 'zstd -f {fpath}'
     fsize = lambda fpath: os.stat(fpath).st_size  # in Bytes
     for stream in streams:
         fpath = fname_helper.mdfdst_fname_for_reading(

python/MooreTests/run_bandwidth_test_jobs.py

@@ -198,12 +198,30 @@ if __name__ == '__main__':
         )
 
     # Always use config['input_files'] for inputs if available.
-    # Otherwise, use config['testfiledb_key'] for inputs.
+    # use config['testfiledb_key'] if it exists
+    if "testfiledb_key" in config.keys():
+        from PRConfig.TestFileDB import test_file_db
+        tfdb_entry = test_file_db[config['testfiledb_key']]
+        qualifiers = tfdb_entry.qualifiers
+        if "input_files" not in config:
+            config["input_files"] = tfdb_entry.filenames
+        if "input_type" not in config:
+            file_format = qualifiers['Format']
+            config["input_type"] = 'ROOT' if file_format != 'MDF' else 'RAW'
+        if "data_type" not in config:
+            config["data_type"] = qualifiers['DataType']
+        if "simulation" not in config:
+            config["simulation"] = qualifiers['Simulation']
+        if "dddb_tag" not in config:
+            config["dddb_tag"] = qualifiers['DDDB']
+        if "conddb_tag" not in config:
+            config["conddb_tag"] = qualifiers['CondDB']
+        if "GeometryVersion" in qualifiers and "geometry_version" not in config:
+            config["geometry_version"] = qualifiers["GeometryVersion"]
+        if "ConditionsVersion" in qualifiers and "conditions_version" not in config:
+            config["conditions_version"] = qualifiers["ConditionsVersion"]
     if "input_files" in config.keys():
         inputs_fns = config["input_files"]
-    elif "testfiledb_key" in config.keys():
-        from PRConfig.TestFileDB import test_file_db
-        inputs_fns = test_file_db[config['testfiledb_key']].filenames
     else:
         raise KeyError(
             f'{args.config} does not provide either the "testfiledb_key" or "input_files".'

scripts/benchmark-scripts/Moore_bandwidth_test.sh

@@ -178,19 +178,21 @@ case $PROCESS in
     case $INPUTDATA in
         nominal)
         INPUT_TYPE="RAW"
-        EXTRA_OPTS='-e 1' # Requires #EvtSlots==1 due to writing dsts, must be single threaded.
+        # Requires #EvtSlots==1 due to writing dsts, must be single threaded.
+        # Compression as per sprucing production.
+        EXTRA_OPTS='-e 1 ${APPCONFIGOPTS}/Persistency/Compression-LZMA-4.py'
         ;;
         hlt2-output-locally)
         # "hlt2-output-locally" corresponds to using the locally-run full-stream output from "process=hlt2, input-data=nominal" test.
         INPUT_TYPE="MDF"
-        EXTRA_OPTS='-e 1 -um'
+        EXTRA_OPTS='-e 1 -um ${APPCONFIGOPTS}/Persistency/Compression-LZMA-4.py'
         # Flag to make a top-level human-readable output page directing to the Hlt2 and Spruce output pages.
         ;;
         hlt2-output-from-eos)
         # "hlt2-output-from-eos" corresponds to using the uploaded full-stream output from a "process=hlt2, input-data=nominal" test.
         # These files are overwritten during "lhcb-master" builds of "process=hlt2, input-data=nominal", i.e. ~daily.
         INPUT_TYPE="MDF"
-        EXTRA_OPTS='-e 1 -um'
+        EXTRA_OPTS='-e 1 -um ${APPCONFIGOPTS}/Persistency/Compression-LZMA-4.py'
         ;;
         *)
         echo "ERROR: --input-data must be \"nominal\", \"hlt2-output-locally\", \"hlt2-output-from-eos\" for process \"$PROCESS\""