From aae219f2713ebb503d6ac41ed668c37f8a3af19a Mon Sep 17 00:00:00 2001
From: Jiri Masik <jiri.masik@cern.ch>
Date: Fri, 6 Sep 2024 19:05:03 +0200
Subject: [PATCH] take globalTags from defaultConditionsTags / 1st part also
for 24.0
take globalTags from defaultConditionsTags / 1st part also for 24.0
---
.../python/TestDefaults.py | 26 +++++++++++++++++++
.../share/TrigInDetValidation_Base.py | 6 +++--
.../test/test_trig_mc_v1Dev_ITk_build.py | 4 ++-
...test_trig_mc_v1Dev_ITk_ttbar200PU_build.py | 4 ++-
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index 5a88ad5f037..b60e12c0533 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 d89a274dfdc..51d5585bd9d 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 683dc395e61..81efb982161 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 301d751c218..b5c72c4b04e 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()
--
GitLab