diff --git a/python/PRConfig/TestFileDB.py b/python/PRConfig/TestFileDB.py
index b605f32e8ff5b6e7f1a30b3dd4d687e4ad0be5bf..5ed9b66724203594e3a8ababc826e1e9e3c10e95 100644
--- a/python/PRConfig/TestFileDB.py
+++ b/python/PRConfig/TestFileDB.py
@@ -13922,7 +13922,7 @@ testfiles(
'DataType': 'Upgrade',
'Date': '2024-03-22',
'Simulation': True,
- "GeometryVersion": "run3/trunk",
+ "GeometryVersion": "run3/2024.Q1.2-v00.00",
"ConditionsVersion": "master",
"DDDB": "dddb-20231017",
"CondDB": "sim-20231017-vc-md100",
@@ -14952,3 +14952,448 @@ testfiles(
},
comment="File used for runDigitizationForProfiling test of Boole",
test_file_db=test_file_db)
+
+testfiles(
+ myname='excl_spruce_2022',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/2022_1_FULL_255620_00150001_0005.raw'
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-01-19',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for excl_spruce_2022 test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='pass_spruce_2022',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/2022_1_TURBO_255620_00150000_0003.raw'
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-01-19',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for pass_spruce_2022 test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='turcal_spruce_2022',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/2022_1_TURCAL_255620_00150013_0002.raw'
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-07-14',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for turcal_spruce_2022 test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='excl_spruce_2023',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/COLLISION23_FULL_270356_00140003_0001.raw'
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-31',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for excl_spruce_2023 test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='excl_spruce_2023-2',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/COMMISSIONING23_78July_FULL_269370_00110015_0002.raw'
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-01',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for excl_spruce_2023 test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='spruce_all_lines_realtime_test_old_json',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/samples/mc/Hlt1Hlt2filtered_MinBias_sprucing/hlt2_2or3bodytopo_realtime_newPacking.mdf'
+ ],
+ qualifiers={
+ 'Author': 'sesen',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2022-03-24',
+ 'Simulation': True,
+ 'DDDB': 'dddb-20171126',
+ 'CondDB': 'sim-20171127-vc-md100',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment=
+ "File used for spruce_all_lines_realtime_test_old_json test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='spruce_all_lines_realtime',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/samples/mc/Hlt1Hlt2filtered_MinBias_sprucing/hlt2_2or3bodytopo_realtime_newPacking_newDst.mdf'
+ ],
+ qualifiers={
+ 'Author': 'sesen',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2022-09-16',
+ 'Simulation': True,
+ 'DDDB': 'dddb-20171126',
+ 'CondDB': 'sim-20171127-vc-md100',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for spruce_all_lines_realtime test of Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='spruce_bandwidth_input',
+ filenames=[
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/EoY-spruce-2024/307781_00090010_0105.raw',
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/EoY-spruce-2024/307781_00090011_0074.raw',
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/EoY-spruce-2024/307781_00090012_0106.raw',
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/EoY-spruce-2024/307781_00090015_0004.raw',
+ 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/EoY-spruce-2024/307781_00090015_0073.raw',
+ ],
+ qualifiers={
+ 'Author': 'abertoli',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2024-10-14',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/2024.Q1.2-v00.00',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for spruce bandwidth tests",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='hlt2_bandwidth_input_2024',
+ filenames=[
+ # NOTE: there's lots more mdfs in this directory. Here should be 200-300k events
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-185948-171_VAEB04_1673.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-185252-769_SAEB10_1547.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-185309-473_VAEB08_1551.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-190040-374_SCEB07_1687.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-190515-414_ECEB03_1774.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-185646-237_SAEB18_1618.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-191432-329_R1EB18_1956.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-185838-398_SAEB09_1651.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-190451-142_R1EB08_1766.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/mdfs_hlt1filtered_307586/Run_0000307586_20241003-190552-675_SAEB07_1786.mdf",
+ ],
+ qualifiers={
+ 'Author': 'decianm',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2024-10-12',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/2024.Q1.2-v00.00',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for spruce bandwidth tests",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='hlt2_pp_realdata_with_UT',
+ filenames=[
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/COLLISION24-run292798/Run_0000292798_20240501-033654-120_PLEB01_1873.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/COLLISION24-run292798/Run_0000292798_20240501-033655-964_UAEB04_1839.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/COLLISION24-run292798/Run_0000292798_20240501-033655-976_R1EB20_1848.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/COLLISION24-run292798/Run_0000292798_20240501-033656-078_MCEB04_1838.mdf",
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP3/bandwidth_division/COLLISION24-run292798/Run_0000292798_20240501-033656-098_UCEB05_1857.mdf",
+ ],
+ qualifiers={
+ 'Author': 'decianm',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2024-05-01',
+ 'Simulation': False,
+ 'DDDB': 'run3/2024.Q1.2-v00.00',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/2024.Q1.2-v00.00',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for hlt2_pp_realdata_with_UT's test in Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='hlt2_pp_2022_reprocessing_data_production_options',
+ filenames=[
+ "mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2022/RAW/PASSTHROUGH/LHCb/COLLISION22/256264/256264_00090018_0006.raw",
+ ],
+ qualifiers={
+ 'Author': 'rmatev',
+ 'Format': 'MDF',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-07-17',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/master',
+ 'CondDB': 'upgrade/master',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment=
+ "File used for hlt2_pp_2022_reprocessing_data_production_options's test in Moore",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='DaVinciTutorials',
+ filenames=[
+ 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.dst'
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-06-26',
+ 'Simulation': True,
+ 'DDDB': 'dddb-20180815',
+ 'CondDB': 'sim-20180530-vc-md100',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for DaVinci tutorials",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Turbo_rd_data_with_lumi',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb//LHCb/Commissioning23/RD.DST/00195021/0000/00195021_00001377_1.rd.dst",
+ ],
+ qualifiers={
+ 'Author': '',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-12',
+ 'Simulation': False,
+ 'DDDB': 'run3/trunk',
+ 'CondDB': 'master',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for Turbo_rd_data_with_lumi's test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Turbo_bandq_data_bad_sel_report',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/test_davinci_turbo_hlt_sel_reports.dst",
+ ],
+ qualifiers={
+ 'Author': 'masmith',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2024-07-30',
+ 'Simulation': False,
+ 'DDDB': 'run3/trunk',
+ 'CondDB': 'master',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for Turbo_bandq_data_bad_sel_report's test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_with_lumi_all_lines_noEventsInSelection',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test4/spruce_all_lines_production_1.rd.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-09',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/dddb-20221004',
+ 'CondDB': 'md_VP_SciFi_macromicrosurvey_from20220923',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment=
+ "File used for Spruce_with_lumi_all_lines_noEventsInSelection and test_davinci_tupling_with_lumi_from_spruce_noEventsInSelection tests in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_with_lumi_all_lines_moreRunsdst',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test2/spruce_all_lines_production_moreRuns.b2oc.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-09',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/dddb-20221004',
+ 'CondDB': 'md_VP_SciFi_macromicrosurvey_from20220923',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment=
+ "File used for Spruce_with_lumi_all_lines_moreRunsdst test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_with_lumi_all_lines_moreDstRuns',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test4/spruce_all_lines_production_1.b2oc.dst",
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test4/spruce_all_lines_production_2.b2oc.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-14',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/dddb-20221004',
+ 'CondDB': 'md_VP_SciFi_macromicrosurvey_from20220923',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment=
+ "File used for Spruce_with_lumi_all_lines_moreDstRuns test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_with_lumi_all_lines_moreDstMerged',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test5/spruce_all_lines_production_1.b2oc.dst",
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test5/spruce_all_lines_production_2.b2oc.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-08',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/dddb-20221004',
+ 'CondDB': 'md_VP_SciFi_macromicrosurvey_from20220923',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment=
+ "File used for Spruce_with_lumi_all_lines_moreDstMerged test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_with_lumi_all_lines_mergeDst',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test5/b2oc_spruce_merged.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-08',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/dddb-20221004',
+ 'CondDB': 'md_VP_SciFi_macromicrosurvey_from20220923',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for Spruce_with_lumi_all_lines_mergeDst in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_with_lumi_all_lines_moreDst',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test3/spruce_all_lines_production_1.b2oc.dst",
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/data/lumi/test3/spruce_all_lines_production_2.b2oc.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2023-08-09',
+ 'Simulation': False,
+ 'DDDB': 'upgrade/dddb-20221004',
+ 'CondDB': 'md_VP_SciFi_macromicrosurvey_from20220923',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for Spruce_with_lumi_all_lines_moreDst test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='Spruce_passthrough_B2Dpi_line',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/FlavourTagging/DST/spruce_passthrough_bd2dpi.dst",
+ ],
+ qualifiers={
+ 'Author': 'cprouve',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2024-04-30',
+ 'Simulation': True,
+ 'DDDB': 'dddb-20231017',
+ 'CondDB': 'sim-20231017-vc-md100',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'jonrob/all-pmts-active',
+ },
+ comment="File used for Spruce_passthrough_B2Dpi_line test in DaVinci",
+ test_file_db=test_file_db)
+
+testfiles(
+ myname='HltTisTos_test',
+ filenames=[
+ "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/excl_2023_TISTOSexample.bandq.dst",
+ ],
+ qualifiers={
+ 'Author': 'nskidmor',
+ 'Format': 'ROOT',
+ 'DataType': 'Upgrade',
+ 'Date': '2024-08-31',
+ 'Simulation': False,
+ 'DDDB': '',
+ 'CondDB': '',
+ 'GeometryVersion': 'run3/trunk',
+ 'ConditionsVersion': 'master',
+ },
+ comment="File used for HltTisTos_test test in DaVinci",
+ test_file_db=test_file_db)