python/MooreTests/run_bandwidth_test_jobs.py

@@ -159,7 +159,7 @@ if __name__ == '__main__':
     if args.evtSlots is None:
         args.evtSlots = max(int(round(1.2 * args.threads)), 1 + args.threads)
     '''
-        Make sure input files are available locally 
+        Make sure input files are available locally
         (5x speed-up compared to using online)
     '''
 

python/MooreTests/run_throughput_jobs.py

@@ -590,7 +590,7 @@ if __name__ == '__main__':
             # only for Sprucing thoughtput test for now
             if not ('spruce_all_lines' in args.options[-1].lower()): continue
             if "spruce" in args.options[-1].lower():
-                input_rate = 1.75e5  # assume Hlt2 output rate 175 kHz
+                input_rate = 1.24e5  # assume Hlt2 output rate 124 kHz
             elif "hlt2" in args.options[-1].lower():
                 input_rate = 1e6  # Hlt1 output rate 1 MHz
             else:

python/PRConfig/TestFileDB.py

@@ -13162,3 +13162,27 @@ testfiles(
     comment=
     '2022 raw data with SMOG2 injection, for testing on data with both pp and SMOG2 collisions',
     test_file_db=test_file_db)
+
+testfiles(
+    myname='upgrade-minbias-hlt2-full-output-Aug2023',
+    filenames=[
+        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/hlt2_full_stream_Aug2023/MagDown/hlt2_persistreco_realtime_{0}.mdf"
+        .format(i) for i in range(241)
+    ] + [
+        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/hlt2_full_stream_Aug2023/MagUp/hlt2_persistreco_realtime_{0}.mdf"
+        .format(i) for i in list(range(106)) + list(range(107, 135))
+    ],
+    qualifiers={
+        'Author': 'Shunan Zhang',
+        'Format': 'MDF',
+        'DataType': 'Upgrade',
+        'Date': '2023-08-18',
+        'Simulation': True,
+        "CondDB": "sim-20171127-vc-md100",
+        "GeometryVersion": "trunk",
+        "ConditionsVersion": "master",
+        "DDDB": "dddb-20171126",
+    },
+    comment=
+    'Hlt2 Full stream output as of August 2023, used as inputs for Sprucing tests, input rate around 124 kHz',
+    test_file_db=test_file_db)

scripts/benchmark-scripts/Moore_spruce_all_lines.sh

@@ -22,9 +22,9 @@ fi
 export THOR_JIT_N_SPLITS=8
 export THOR_JIT_N_JOBS=8
 
-python -m MooreTests.run_throughput_jobs -n=2e4 --avg-event-size=300000 --test-file-db-key=upgrade-minbias-hlt2-full-output-July2023 '$MOOREROOT/tests/options/disable-git-metadata-write.py' '$HLT2CONFROOT/options/sprucing/spruce_all_lines.py' "${cache_dirs[@]}"
+python -m MooreTests.run_throughput_jobs -n=2e4 --avg-event-size=300000 --test-file-db-key=upgrade-minbias-hlt2-full-output-Aug2023 '$MOOREROOT/tests/options/disable-git-metadata-write.py' '$HLT2CONFROOT/options/sprucing/spruce_all_lines.py' "${cache_dirs[@]}"
 
-python -m MooreTests.run_throughput_jobs -n=-1 -j 1 --profile --avg-event-size=300000 --test-file-db-key=upgrade-minbias-hlt2-full-output-July2023 '$MOOREROOT/tests/options/disable-git-metadata-write.py' '$HLT2CONFROOT/options/sprucing/spruce_all_lines.py' "${cache_dirs[@]}"
+python -m MooreTests.run_throughput_jobs -n=-1 -j 1 --profile --avg-event-size=300000 --test-file-db-key=upgrade-minbias-hlt2-full-output-Aug2023 '$MOOREROOT/tests/options/disable-git-metadata-write.py' '$HLT2CONFROOT/options/sprucing/spruce_all_lines.py' "${cache_dirs[@]}"
 
 # force 0 return code so the handler runs even for failed jobs
 exit 0

scripts/benchmark-scripts/Moore_spruce_bandwidth.sh

@@ -21,8 +21,8 @@ mkdir -p tmp/Output/Inter
 
 # 1. Run options files for baseline models
 echo 'Running trigger to obtain MDF files for comparison'
-time python -m MooreTests.run_bandwidth_test_jobs -n=1e4 -t=$MOORE_THREADS -a=220 --test-file-db-key=upgrade-minbias-hlt2-full-output-July2023 '$HLT2CONFROOT/tests/options/bandwidth/spruce_bandwidth_streamless.py' # No streaming
-time python -m MooreTests.run_bandwidth_test_jobs -n=1e5 -t=$MOORE_THREADS -a=220 --test-file-db-key=upgrade-minbias-hlt2-full-output-July2023 '$HLT2CONFROOT/tests/options/bandwidth/spruce_bandwidth_wg_streams.py' # One stream per WG
+time python -m MooreTests.run_bandwidth_test_jobs -n=1e4 -t=$MOORE_THREADS -a=300 --test-file-db-key=upgrade-minbias-hlt2-full-output-Aug2023 '$HLT2CONFROOT/tests/options/bandwidth/spruce_bandwidth_streamless.py' # No streaming
+time python -m MooreTests.run_bandwidth_test_jobs -n=1e5 -t=$MOORE_THREADS -a=300 --test-file-db-key=upgrade-minbias-hlt2-full-output-Aug2023 '$HLT2CONFROOT/tests/options/bandwidth/spruce_bandwidth_wg_streams.py' # One stream per WG
 
 # 2. Compute line descriptives: persist reco, extra output
 echo 'Obtaining line descriptives'
@@ -42,7 +42,7 @@ time python $PRCONFIGROOT/python/MooreTests/stream-overlap.py -p Spruce -i tmp/M
 echo 'Obtaining rates and bandwidth for wg-stream configuration'
 for module in b_to_open_charm rd bandq charm qee charm b_to_charmonia slepton c_to_dimuon bnoc; do
     echo "Stream name: ${module}"
-    time python $PRCONFIGROOT/python/MooreTests/line-and-stream-rates.py -n 1e5 -p Spruce -r 175 -i tmp/MDF/baseline-wg-"${module}".mdf -t tmp/MDF/baseline-wg-streams.tck.json -j tmp/Output/wg-stream-config.json -c wg
+    time python $PRCONFIGROOT/python/MooreTests/line-and-stream-rates.py -n 1e5 -p Spruce -r 124 -i tmp/MDF/baseline-wg-"${module}".mdf -t tmp/MDF/baseline-wg-streams.tck.json -j tmp/Output/wg-stream-config.json -c wg
 done
 
 echo 'Combining all tables from previous two jobs'