diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py index 5a88ad5f037416c623ad7a039a182feeded00d56..b60e12c05331d5486031555be3d9e1f2e2affecc 100644 --- a/Control/AthenaConfiguration/python/TestDefaults.py +++ b/Control/AthenaConfiguration/python/TestDefaults.py @@ -61,3 +61,29 @@ class defaultGeometryTags: return defaultGeometryTags.RUN3 if flags.GeoModel.Run is LHCPeriod.Run4: return defaultGeometryTags.RUN4 + + +class defaultConditionsTags: + RUN2_DATA = "CONDBR2-BLKPA-RUN2-11" + RUN2_MC = "OFLCOND-MC16-SDR-RUN2-11" + RUN3_DATA = "CONDBR2-BLKPA-2024-04" # TODO: switch to proper global tag once available + RUN3_MC = "OFLCOND-MC23-SDR-RUN3-05" + RUN4_MC = "OFLCOND-MC21-SDR-RUN4-02" + + @staticmethod + def autoconfigure(flags): + # TODO: uncomment when defaults are removed + # if flags.IOVDb.GlobalTag: + # return flags.IOVDb.GlobalTag + + from AthenaConfiguration.Enums import LHCPeriod + if flags.GeoModel.Run is LHCPeriod.Run1: + raise ValueError("No default conditions tags for Run 1") + if flags.GeoModel.Run is LHCPeriod.Run2: + return defaultConditionsTags.RUN2_MC if flags.Input.isMC else defaultConditionsTags.RUN2_DATA + if flags.GeoModel.Run is LHCPeriod.Run3: + if flags.Input.isMC: + return defaultConditionsTags.RUN3_MC + raise ValueError("No default data conditions tag for Run 3") + if flags.GeoModel.Run is LHCPeriod.Run4: + return defaultConditionsTags.RUN4_MC diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py index d89a274dfdcb61d28dd5bc22a8402bc5241e26c5..51d5585bd9d1636e398597292f317b132b075a29 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py +++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py @@ -119,10 +119,12 @@ if GridFiles: rdo2aod.args += ' --inputRDOFile=$ArtInFile ' # temporary conditions override: force MC23e global tag by default and Run4 global tag for Run4 inputs, until input RDOs are updated +from AthenaConfiguration.TestDefaults import defaultConditionsTags + if "conditionsOverride" not in locals(): - rdo2aod.args += ' --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-05"' + rdo2aod.args += f' --conditionsTag "default:{defaultConditionsTags.RUN3_MC}"' elif conditionsOverride == "Run4": - rdo2aod.args += ' --conditionsTag "default:OFLCOND-MC21-SDR-RUN4-02"' + rdo2aod.args += f' --conditionsTag "default:{defaultConditionsTags.RUN4_MC}"' if (Malloc): diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_build.py index 683dc395e615ca8446a5ae09507e41d9dc990bcb..81efb9821619c69ba0988d5e6e1f55d8b155b896 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_build.py +++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_build.py @@ -16,12 +16,14 @@ run.type = 'athena' run.threads = 1 run.input = 'Single_mu_Run4' run.job_options = 'TriggerJobOpts/runHLT.py' + +from AthenaConfiguration.TestDefaults import defaultConditionsTags run.flags = ['Trigger.triggerMenuSetup="MC_pp_run4_v1"', 'Trigger.doRuntimeNaviVal=True', 'ITk.doTruth=False', 'Tracking.doTruth=False', 'Trigger.enableL1CaloPhase1=False', - 'IOVDb.GlobalTag="OFLCOND-MC21-SDR-RUN4-01"' + f'IOVDb.GlobalTag={defaultConditionsTags.RUN4_MC}' ] # The full test configuration diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_ttbar200PU_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_ttbar200PU_build.py index 301d751c2182f58d9c19c5cab296667d2972b2dd..b5c72c4b04e07f6b0e83a9180934dc58a38fce26 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_ttbar200PU_build.py +++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_ttbar200PU_build.py @@ -16,11 +16,13 @@ run.type = 'athena' run.threads = 1 run.input = 'ttbar_pu200_Run4' run.job_options = 'TriggerJobOpts/runHLT.py' + +from AthenaConfiguration.TestDefaults import defaultConditionsTags run.flags = ['Trigger.doRuntimeNaviVal=True', 'ITk.doTruth=False', 'Tracking.doTruth=False', 'Trigger.enabledSignatures=[\\\"Egamma\\\",\\\"Electron\\\",\\\"Photon\\\",\\\"Muon\\\",\\\"Tau\\\",\\\"Jet\\\",\\\"MET\\\"]', - 'IOVDb.GlobalTag="OFLCOND-MC21-SDR-RUN4-02"'] + f'IOVDb.GlobalTag={defaultConditionsTags.RUN4_MC}'] # The full test configuration test = Test.Test()