Merge branch '24.0_ART_newEB_HLTP' into '24.0'

TrigValidation and TriggerJobOpts: update ART data inputs, move to CONDBR2-HLTP-2024-01

See merge request !71286

Tools/WorkflowTestRunner/python/References.py

@@ -20,7 +20,7 @@ references_map = {
     # Overlay
     "d1726": "v2",
     "d1759": "v2",
-    "d1912": "v2",
+    "d1912": "v4",
     # Reco
     "q442": "v3",
     "q449": "v3",

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py

@@ -56,7 +56,7 @@ tlareco.input = ''
 tlareco.explicit_input = True
 tlareco.args = '--inputBSFile=' + find_file('*.physics_FTagPEBTLA*._athenaHLT*.data')  # output of the previous step
 tlareco.args += ' --outputDAOD_TLAFTAGPEBFile=DAOD_TLAFTAGPEB.pool.root'
-tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2022-08\' --geometryVersion=\'ATLAS-R3S-2021-03-00-00\''
+tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tlareco.args += ' --preExec="{:s}"'.format(tlarecoPreExec)
 tlareco.args += ' --CA'
 

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py

@@ -56,7 +56,7 @@ tlareco.input = ''
 tlareco.explicit_input = True
 tlareco.args = '--inputBSFile=' + find_file('*.physics_TLA*._athenaHLT*.data')  # output of the previous step
 tlareco.args += ' --outputDAOD_TLAFile=DAOD_TLA.pool.root'
-tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2022-08\' --geometryVersion=\'ATLAS-R3S-2021-03-00-00\''
+tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tlareco.args += ' --preExec="{:s}"'.format(tlarecoPreExec)
 tlareco.args += ' --CA'
 

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py

@@ -26,7 +26,7 @@ hlt.args += ' --outputBSFile=RAW.pool.root'
 hlt.args += ' --outputHIST_HLTMONFile=hltmon.root'
 hlt.args += ' --outputDRAW_TRIGCOSTFile=TRIGCOST.pool.root'
 hlt.args += ' --outputNTUP_TRIGCOSTFile=cost.ntup.root'
-hlt.args += ' --runNumber 440499'  # RunNumber is set by Panda, but ignored by Trf to avoid changes from !48070
+hlt.args += ' --runNumber 475321'  # RunNumber is set by Panda, but ignored by Trf to avoid changes from !48070
 
 #====================================================================================================
 # Tier-0 reco step (BS->AOD)
@@ -62,7 +62,7 @@ tzreco.args = '--inputBSFile=RAW.pool.root'  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputNTUP_TRIGRATEFile=rate.ntup.root'
 tzreco.args += ' --outputHISTFile=hist.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2022-08\' --geometryVersion=\'ATLAS-R3S-2021-03-00-00\''
+tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 tzreco.args += ' --CA'
 

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py

@@ -67,7 +67,7 @@ tzreco.max_events = 50
 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=hist.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2022-08\' --geometryVersion=\'ATLAS-R3S-2021-03-00-00\''
+tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 tzreco.args += ' --CA'
 

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py

@@ -76,7 +76,7 @@ tzreco.explicit_input = True
 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=hist.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2022-08\' --geometryVersion=\'ATLAS-R3S-2021-03-00-00\''
+tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 tzreco.args += ' --CA'
 

Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json

@@ -3,15 +3,15 @@
         "source": "data",
         "format": "BS",
         "paths": [
-	    "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data22_13p6TeV.00440499.physics_EnhancedBias.merge.RAW._lb0470._SFO-11._0001.1",
-	    "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data22_13p6TeV.00440499.physics_EnhancedBias.merge.RAW._lb0470._SFO-12._0001.1"
+	    "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data24_13p6TeV.00475321.physics_EnhancedBias.merge.RAW._lb0231._SFO-11._0001.1",
+	    "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data24_13p6TeV.00475321.physics_EnhancedBias.merge.RAW._lb0231._SFO-12._0001.1"
         ]
     },
     "data_Main": {
         "source": "data",
         "format": "BS",
         "paths": [
-            "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data22_13p6TeV.00440499.physics_Main.daq.RAW._lb0461._SFO-13._0004.data"
+            "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data24_13p6TeV.00475321.physics_Main.daq.RAW._lb0247._SFO-11._0006.data"
         ]
     },
     "data_run1": {

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py

@@ -22,8 +22,7 @@ def trigGlobalTag(flags):
     """Return global conditions data to be used in the HLT. Return None to indicate that
     no trigger-specific tag is required. Used for IOVDb.GlobalTag in AllConfigFlags.py.
     """
-    return None if flags.Input.isMC else 'CONDBR2-HLTP-2023-01'
-
+    return None if flags.Input.isMC else 'CONDBR2-HLTP-2024-01'
 
 def trigGeoTag(flags):
     """Return geometry tag to be used in the HLT. Returns None to indicate that
@@ -95,14 +94,15 @@ def createTriggerFlags(doTriggerRecoFlags):
     flags.addFlag('Trigger.L1MuonSim.CondDBOffline', 'OFLCOND-MC16-SDR-RUN2-04',
                   help='offline CondDB tag for RPC/TGC coincidence window in rerunLVL1 on data')
 
-    flags.addFlag('Trigger.L1MuonSim.RPCNBX', 8,
+    flags.addFlag('Trigger.L1MuonSim.RPCNBX', lambda prevFlags:
+                  8 if prevFlags.Input.isMC else 4,
                   help='Number of bunch crossings in RPC readout')
 
-    flags.addFlag('Trigger.L1MuonSim.RPCNBCZ', 3,
+    flags.addFlag('Trigger.L1MuonSim.RPCNBCZ', lambda prevFlags:
+                  3 if prevFlags.Input.isMC else 1,
                   help='Nominal BC for RPC readout')
 
 
-
     # Detector flags
     flags.addFlag('Trigger.doID', True,
                   help='enable Inner Detector')