Change directory to look in for expected_2024 min bias in tests

FYI @tevans

Goes with lhcb/Moore!3169 (merged)

As announced here, the files corresponding to expected-2024 min. bias hlt1 filtered MC are about to move, and therefore paths need updating. I changed all the ones I could find in the repo on the master branch.

Also add some extra files that are needed for the BW tests to the TestFileDB.

Can be undrafted and tested once the file move is complete.

python/PRConfig/TestFileDB.py

@@ -13623,19 +13623,42 @@ testfiles(
     'Test sample of B2JpsiK with Jpsi2ee for electron run 3 studies, MagDown, Sim10c',
     test_file_db=test_file_db)
+testfiles(
+    myname='expected_2024_min_bias_mdf',
+    filenames=[
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta//WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/30000000/allen_input_{0}.mdf'
+        .format(i) for i in range(65)
+    ],
+    qualifiers={
+        'Author': 'Ross Hunter',
+        'Format': 'MDF',
+        'DataType': 'Upgrade',
+        'Date': '2024-03-22',
+        'Simulation': True,
+        "GeometryVersion": "run3/trunk",
+        "ConditionsVersion": "master",
+        "DDDB": "dddb-20231017",
+        "CondDB": "sim-20231017-vc-md100",
+    },
+    comment='\n'.join([
+        "Same as exp_24_minbias_Sim10c_magdown but just in MDF format",
+        "for usage in HLT1 bandwidth tests"
+    ]),
+    test_file_db=test_file_db)
+
 testfiles(
     myname='expected_2024_min_bias_hlt1_filtered',
     filenames=[
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_0.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_1.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_2.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_3.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_4.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_5.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_6.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_7.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_8.mdf',
-        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-nu7.6/hlt1_filtered/v1/30000000/input_9.mdf'
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_0.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_1.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_2.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_3.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_4.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_5.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_6.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_7.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_8.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v1/30000000/input_9.mdf'
     ],
     qualifiers={
         'Author': 'Ross Hunter',
@@ -13661,7 +13684,7 @@ testfiles(
 testfiles(
     myname='minbias-Beam6800GeV-expected-2024-MagUp-Nu1.6-hlt1-filtered',
     filenames=[
-        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagUp-Nu1.6/hlt1_filtered/30000000/input_{0}.mdf"
+        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagUp-Nu1.6/hlt1_filtered/v1/30000000/input_{0}.mdf"
         .format(i) for i in range(8)
     ],
     qualifiers={
@@ -13680,7 +13703,7 @@ testfiles(
 testfiles(
     myname='minbias-Beam6800GeV-expected-2024-MagUp-Nu4.3-hlt1-filtered',
     filenames=[
-        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagUp-Nu4.3/hlt1_filtered/30000000/input_{0}.mdf"
+        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagUp-Nu4.3/hlt1_filtered/v1/30000000/input_{0}.mdf"
         .format(i) for i in range(16)
     ],
     qualifiers={
@@ -13699,7 +13722,7 @@ testfiles(
 testfiles(
     myname='minbias-Beam6800GeV-expected-2024-MagUp-Nu5.7-hlt1-filtered',
     filenames=[
-        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagUp-Nu5.7/hlt1_filtered/30000000/input_{0}.mdf"
+        "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagUp-Nu5.7/hlt1_filtered/v1/30000000/input_{0}.mdf"
         .format(i) for i in range(20)
     ],
     qualifiers={
@@ -13771,3 +13794,63 @@ testfiles(
     comment=
     'Min bias mdfs for testing upgrade Hlt2 reconstruction. From sim+std://MC/Dev/Beam6800GeV-expected-2024-Mag*-Nu*-Pythia8 . Filtered using by HLT1 using the configuration resulting from the BW optimisation for 2024 presented at https://indico.cern.ch/event/1361635/contributions/5753029/attachments/2780757/4846644/bandwidth_division_jan15.pdf',
     test_file_db=test_file_db)
+
+testfiles(
+    myname='expected_2024_min_bias_hlt1_filtered_v2',
+    filenames=[
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_0.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_1.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_2.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_3.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_4.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_5.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_6.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_7.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_8.mdf',
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/Beam6800GeV-expected-2024-MagDown-Nu7.6/hlt1_filtered/v2/30000000/input_9.mdf',
+    ],
+    qualifiers={
+        'Author': 'Shunan Zhang',
+        'Format': 'MDF',
+        'DataType': 'Upgrade',
+        'Date': '2024-03-22',
+        'Simulation': True,
+        "GeometryVersion": "run3/trunk",
+        "ConditionsVersion": "master",
+        "DDDB": "dddb-20231017",
+        "CondDB": "sim-20231017-vc-md100",
+    },
+    comment='\n'.join([
+        "Around 100k HLT1-filtered min bias in expected 2024 conditions",
+        "v2 update in March 2024 - HLT1 output rate of 1 MHz",
+        "same HLT1 input as expected_2024_min_bias_hlt1_filtered",
+        "filtered by HLT1 bandwidth division according to Allen thresholds on commit cf2073ab of tevans/tuned_2024"
+    ]),
+    test_file_db=test_file_db)
+
+testfiles(
+    myname='expected_2024_min_bias_hlt2_full_stream_v2',
+    filenames=[
+        'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/hlt2_full_stream_20240322/hlt2_full_stream_{0}.mdf'
+        .format(i) for i in range(148)
+    ],
+    qualifiers={
+        'Author': 'Shunan Zhang',
+        'Format': 'MDF',
+        'DataType': 'Upgrade',
+        'Date': '2024-03-22',
+        'Simulation': True,
+        "GeometryVersion": "run3/trunk",
+        "ConditionsVersion": "master",
+        "DDDB": "dddb-20231017",
+        "CondDB": "sim-20231017-vc-md100",
+    },
+    comment='\n'.join([
+        "Output of HLT2 full stream running on HLT1-filtered min bias in expected 2024 conditions",
+        "v2 update in March 2024",
+        "include HLT2 full stream update as of March 21, 2024",
+        "used as input files to the Sprucing PR tests",
+        "efficiency around 5.9%, input rate around 59 kHz",
+        "lhcb-metadata key: adb09877"
+    ]),
+    test_file_db=test_file_db)