Skip to content
Snippets Groups Projects
Commit aae219f2 authored by Jiri Masik's avatar Jiri Masik Committed by Sara Alderweireldt
Browse files

take globalTags from defaultConditionsTags / 1st part also for 24.0

take globalTags from defaultConditionsTags / 1st part also for 24.0
parent d37951d1
No related branches found
No related tags found
No related merge requests found
...@@ -61,3 +61,29 @@ class defaultGeometryTags: ...@@ -61,3 +61,29 @@ class defaultGeometryTags:
return defaultGeometryTags.RUN3 return defaultGeometryTags.RUN3
if flags.GeoModel.Run is LHCPeriod.Run4: if flags.GeoModel.Run is LHCPeriod.Run4:
return defaultGeometryTags.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
...@@ -119,10 +119,12 @@ if GridFiles: ...@@ -119,10 +119,12 @@ if GridFiles:
rdo2aod.args += ' --inputRDOFile=$ArtInFile ' 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 # 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(): 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": elif conditionsOverride == "Run4":
rdo2aod.args += ' --conditionsTag "default:OFLCOND-MC21-SDR-RUN4-02"' rdo2aod.args += f' --conditionsTag "default:{defaultConditionsTags.RUN4_MC}"'
if (Malloc): if (Malloc):
......
...@@ -16,12 +16,14 @@ run.type = 'athena' ...@@ -16,12 +16,14 @@ run.type = 'athena'
run.threads = 1 run.threads = 1
run.input = 'Single_mu_Run4' run.input = 'Single_mu_Run4'
run.job_options = 'TriggerJobOpts/runHLT.py' run.job_options = 'TriggerJobOpts/runHLT.py'
from AthenaConfiguration.TestDefaults import defaultConditionsTags
run.flags = ['Trigger.triggerMenuSetup="MC_pp_run4_v1"', run.flags = ['Trigger.triggerMenuSetup="MC_pp_run4_v1"',
'Trigger.doRuntimeNaviVal=True', 'Trigger.doRuntimeNaviVal=True',
'ITk.doTruth=False', 'ITk.doTruth=False',
'Tracking.doTruth=False', 'Tracking.doTruth=False',
'Trigger.enableL1CaloPhase1=False', 'Trigger.enableL1CaloPhase1=False',
'IOVDb.GlobalTag="OFLCOND-MC21-SDR-RUN4-01"' f'IOVDb.GlobalTag={defaultConditionsTags.RUN4_MC}'
] ]
# The full test configuration # The full test configuration
......
...@@ -16,11 +16,13 @@ run.type = 'athena' ...@@ -16,11 +16,13 @@ run.type = 'athena'
run.threads = 1 run.threads = 1
run.input = 'ttbar_pu200_Run4' run.input = 'ttbar_pu200_Run4'
run.job_options = 'TriggerJobOpts/runHLT.py' run.job_options = 'TriggerJobOpts/runHLT.py'
from AthenaConfiguration.TestDefaults import defaultConditionsTags
run.flags = ['Trigger.doRuntimeNaviVal=True', run.flags = ['Trigger.doRuntimeNaviVal=True',
'ITk.doTruth=False', 'ITk.doTruth=False',
'Tracking.doTruth=False', 'Tracking.doTruth=False',
'Trigger.enabledSignatures=[\\\"Egamma\\\",\\\"Electron\\\",\\\"Photon\\\",\\\"Muon\\\",\\\"Tau\\\",\\\"Jet\\\",\\\"MET\\\"]', '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 # The full test configuration
test = Test.Test() test = Test.Test()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment