Merge branch 'trigger_flags_to_configflags' into 'master'

Move more configuration to ConfigFlags

See merge request atlas/athena!35543

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py

@@ -25,9 +25,9 @@ class opt:
     useCONDBR2       = True           # if False, use run-1 conditions DB
     condOverride     = {}             # overwrite conditions folder tags e.g. '{"Folder1":"Tag1", "Folder2":"Tag2"}'
     doHLT            = True           # run HLT?
-    doID             = True           # TriggerFlags.doID
-    doCalo           = True           # TriggerFlags.doCalo
-    doMuon           = True           # TriggerFlags.doMuon
+    doID             = True           # ConfigFlags.Trigger.doID
+    doCalo           = True           # ConfigFlags.Trigger.doCalo
+    doMuon           = True           # ConfigFlags.Trigger.doMuon
     doDBConfig       = None           # dump trigger configuration
     trigBase         = None           # file name for trigger config dump
     enableCostD3PD   = False          # enable cost monitoring
@@ -142,7 +142,7 @@ if len(athenaCommonFlags.FilesInput())>0:
         opt.setDetDescr = af.fileinfos.get('geometry',None)
     if opt.setGlobalTag is None:
         opt.setGlobalTag = af.fileinfos.get('conditions_tag',None) or \
-            (TriggerFlags.OnlineCondTag() if opt.isOnline else 'CONDBR2-BLKPA-2018-13')
+            (ConfigFlags.Trigger.OnlineCondTag if opt.isOnline else 'CONDBR2-BLKPA-2018-13')
     TriggerJobOpts.Modifiers._run_number = af.fileinfos['run_number'][0]
 
 else:   # athenaHLT
@@ -165,14 +165,13 @@ ConfigFlags.Input.Format = 'BS' if globalflags.InputFormat=='bytestream' else 'P
 
 
 # Set final Cond/Geo tag based on input file, command line or default
-globalflags.DetDescrVersion = opt.setDetDescr or TriggerFlags.OnlineGeoTag()
+globalflags.DetDescrVersion = opt.setDetDescr or ConfigFlags.Trigger.OnlineGeoTag
 ConfigFlags.GeoModel.AtlasVersion = globalflags.DetDescrVersion()
-globalflags.ConditionsTag = opt.setGlobalTag or TriggerFlags.OnlineCondTag()
+globalflags.ConditionsTag = opt.setGlobalTag or ConfigFlags.Trigger.OnlineCondTag
 ConfigFlags.IOVDb.GlobalTag = globalflags.ConditionsTag()
 
 # Other defaults
-jobproperties.Beam.beamType = 'collisions'
-ConfigFlags.Beam.Type = jobproperties.Beam.beamType()
+ConfigFlags.Beam.Type = jobproperties.Beam.beamType = 'collisions'
 jobproperties.Beam.bunchSpacing = 25
 globalflags.DatabaseInstance='CONDBR2' if opt.useCONDBR2 else 'COMP200'
 ConfigFlags.IOVDb.DatabaseInstance=globalflags.DatabaseInstance()
@@ -183,8 +182,8 @@ globalflags.print_JobProperties()
 
 # Set default doL1Sim option depending on input type (if not set explicitly)
 if 'doL1Sim' not in globals():
-    opt.doL1Sim = globalflags.DataSource != 'data'
-    log.info('Setting default doL1Sim=%s because globalflags.DataSource=%s', opt.doL1Sim, globalflags.DataSource())
+    opt.doL1Sim = ConfigFlags.Input.isMC
+    log.info('Setting default doL1Sim=%s because ConfigFlags.Input.isMC=%s', opt.doL1Sim, ConfigFlags.Input.isMC)
 
 # Translate opts to flags for LVL1
 ConfigFlags.Trigger.doLVL1 = opt.doL1Sim
@@ -275,23 +274,23 @@ include.block("RecExCond/RecExCommon_flags.py")
 #-------------------------------------------------------------
 # Setting DetFlags
 #-------------------------------------------------------------
-if globalflags.InputFormat.is_bytestream():
-    TriggerFlags.doLVL1 = False
+if ConfigFlags.Input.Format == 'BS':
+    ConfigFlags.Trigger.doLVL1 = False
 
 from AthenaCommon.DetFlags import DetFlags
-if TriggerFlags.doLVL1():
+if ConfigFlags.Trigger.doLVL1:
     DetFlags.detdescr.all_setOn()
-if TriggerFlags.doID():
+if ConfigFlags.Trigger.doID:
     DetFlags.detdescr.ID_setOn()
     DetFlags.makeRIO.ID_setOn()
 else:
     DetFlags.ID_setOff()
-if TriggerFlags.doMuon():
+if ConfigFlags.Trigger.doMuon:
     DetFlags.detdescr.Muon_setOn()
     DetFlags.makeRIO.all_setOn()
 else:
     DetFlags.Muon_setOff()
-if TriggerFlags.doCalo():
+if ConfigFlags.Trigger.doCalo:
     DetFlags.detdescr.Calo_setOn()
     from LArConditionsCommon.LArCondFlags import larCondFlags
     larCondFlags.LoadElecCalib.set_Value_and_Lock(False)
@@ -371,18 +370,18 @@ from AthenaCommon.DetFlags import DetFlags
 DetFlags.BField_setOn()
 include ("RecExCond/AllDet_detDescr.py")
 
-if TriggerFlags.doID():
+if ConfigFlags.Trigger.doID:
     from InDetRecExample.InDetJobProperties import InDetFlags
     InDetFlags.doPrintConfigurables = log.getEffectiveLevel() <= logging.DEBUG
     include( "InDetRecExample/InDetRecCabling.py" )
 
-if TriggerFlags.doCalo():
+if ConfigFlags.Trigger.doCalo:
     from TrigT2CaloCommon.TrigT2CaloCommonConfig import TrigDataAccess
     svcMgr.ToolSvc += TrigDataAccess()
-    if globalflags.InputFormat.is_pool():
-        TriggerFlags.doTransientByteStream = True # enable transient BS if TrigDataAccess is used with pool data
+    if ConfigFlags.Input.Format == 'POOL':
+        ConfigFlags.Trigger.doTransientByteStream = True # enable transient BS if TrigDataAccess is used with pool data
 
-if TriggerFlags.doMuon():
+if ConfigFlags.Trigger.doMuon:
     TriggerFlags.MuonSlice.doTrigMuonConfig=True
     import MuonCnvExample.MuonCablingConfig  # noqa: F401
     import MuonRecExample.MuonReadCalib      # noqa: F401
@@ -392,7 +391,7 @@ if TriggerFlags.doMuon():
 # ---------------------------------------------------------------
 # ID conditions
 # ---------------------------------------------------------------
-if TriggerFlags.doID:
+if ConfigFlags.Trigger.doID:
     from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
     InDetTrigFlags.doPixelClusterSplitting = False
 
@@ -403,12 +402,12 @@ if TriggerFlags.doID:
 # ----------------------------------------------------------------
 # Pool input
 # ----------------------------------------------------------------
-if globalflags.InputFormat.is_pool():
+if ConfigFlags.Input.Format == 'POOL':
     import AthenaPoolCnvSvc.ReadAthenaPool   # noqa
     svcMgr.AthenaPoolCnvSvc.PoolAttributes = [ "DEFAULT_BUFFERSIZE = '2048'" ]
     svcMgr.PoolSvc.AttemptCatalogPatch=True
     # enable transient BS
-    if TriggerFlags.doTransientByteStream():
+    if ConfigFlags.Trigger.doTransientByteStream:
         log.info("setting up transient BS")
         include( "TriggerJobOpts/jobOfragment_TransBS_standalone.py" )
 
@@ -451,7 +450,7 @@ hltTop += hltBeginSeq
 topSequence += hltTop
 
 if opt.doL1Unpacking:
-    if globalflags.InputFormat.is_bytestream() or opt.doL1Sim:
+    if ConfigFlags.Input.Format == 'BS' or opt.doL1Sim:
         ConfigFlags.Trigger.L1Decoder.forceEnableAllChains = opt.forceEnableAllChains
         from L1Decoder.L1DecoderConfig import L1DecoderCfg
         CAtoGlobalWrapper(L1DecoderCfg, ConfigFlags, seqName="HLTBeginSeq")