Merge branch 'doHLT' into 'master'

TriggerJobOpts: remove TriggerFlags.doHLT

See merge request atlas/athena!47416

HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py

@@ -29,10 +29,6 @@ else:
    athenaCommonFlags.isOnline.set_Value_and_Lock(True)
    del athenaCommonFlags
 
-   ### TriggerFlags
-   from TriggerJobOpts.TriggerFlags import TriggerFlags
-   TriggerFlags.doHLT.set_Value_and_Lock(True)
-
    ### Athena configuration -----------------------------------------------------
    from GaudiPython import *                   # noqa: F401, F403
    from AthenaCommon.Configurable import *     # noqa: F401, F403

Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py

@@ -391,14 +391,6 @@ class rewriteLVL1(_modifier):
                 streamBS.ItemList += [ 'ROIB::RoIBResult#RoIBResult' ]
 
 
-class writeBS(_modifier):
-    """
-    Write bytestream output in athena
-    """
-    def postSetup(self):
-        from AthenaCommon.Include import include
-        include("TriggerJobOpts/BStoBS_post.py")
-
 class DisableMdtT0Fit(_modifier):
     """
     Disable MDT T0 re-fit and use constants from COOL instead

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py

@@ -105,13 +105,11 @@ class TriggerConfigGetter(Configured):
 
         # first check the input
         if "HIT2RDO" in self._environment:
-            TriggerFlags.doHLT = False
             log.info("For simulation jobs the following flags are set:")
             log.info("globalflags.InputFormat             : %s", globalflags.InputFormat())
             log.info("globalflags.DataSource              : %s", globalflags.DataSource())
             log.info("TriggerFlags.configForStartup       : %s", TriggerFlags.configForStartup())
             log.info("TriggerFlags.dataTakingConditions   : %s", TriggerFlags.dataTakingConditions())
-            log.info("TriggerFlags.doHLT                  : %s", TriggerFlags.doHLT())
         else:
             if not self.checkInput():
                 log.error("Could not determine job input. Can't setup trigger configuration and will return!")

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py

@@ -30,14 +30,6 @@ for name in default_false_flags:
     globals()[newFlag.__name__] = newFlag
     _flags.append(newFlag)
 
-class doHLT(JobProperty):
-    """ if True, run HLT selection algorithms """
-    statusOn=True
-    allowedType=['bool']
-    StoredValue=False
-    
-_flags.append(doHLT)
-
 class AODEDMSet(JobProperty):
     """ Define which sets of object go to AOD """
     statusOn=True
@@ -352,4 +344,3 @@ def sync_Trigger2Reco():
     if globalflags.InputFormat() == 'bytestream':
         from AthenaConfiguration.AllConfigFlags import ConfigFlags
         ConfigFlags.Trigger.readBS = True
-        TriggerFlags.doHLT   = False

Trigger/TriggerCommon/TriggerJobOpts/share/BStoBS_post.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-# Job option fragment to merge input bytestream with HLT result
-#
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-acf.BSRDOOutput='AppName=Athena, OutputDirectory=./'
-
-from ByteStreamCnvSvc import WriteByteStream
-StreamBSFileOutput = WriteByteStream.getStream("EventStorage","StreamBSFileOutput")
-
-# BS content definition
-if TriggerFlags.doHLT():
-    StreamBSFileOutput.ItemList   += [ "HLT::HLTResult#HLTResult_HLT" ]
-else:
-    StreamBSFileOutput.ItemList   += [ "HLT::HLTResult#HLTResult_L2" ]
-    StreamBSFileOutput.ItemList   += [ "HLT::HLTResult#HLTResult_EF" ]
-
-
-from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamMergeOutputSvc
-mergeSvc=ByteStreamMergeOutputSvc(ByteStreamOutputSvc='ByteStreamEventStorageOutputSvc',
-                                  ByteStreamInputSvc='ByteStreamInputSvc',
-                                  overWriteHeader=True)
-
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr+=mergeSvc
-
-StreamBSFileOutput.OutputFile = "ByteStreamMergeOutputSvc"
-svcMgr.ByteStreamCnvSvc.ByteStreamOutputSvcList=['ByteStreamMergeOutputSvc']

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py

@@ -70,7 +70,6 @@ class opt:
     disableChains     = []
 
 ################################################################################
-from TriggerJobOpts.TriggerFlags import TriggerFlags
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
 from AthenaCommon.Include import include
@@ -230,7 +229,7 @@ ConfigFlags.Trigger.enableL1CaloPhase1 = opt.enableL1CaloPhase1
 ConfigFlags.Trigger.enableL1CaloLegacy = opt.enableL1CaloLegacy
 ConfigFlags.Trigger.enableL1TopoDump = opt.enableL1TopoDump
 
-ConfigFlags.Trigger.doHLT = TriggerFlags.doHLT = bool(opt.doHLT)
+ConfigFlags.Trigger.doHLT = bool(opt.doHLT)
 ConfigFlags.Trigger.doID = opt.doID
 ConfigFlags.Trigger.doMuon = opt.doMuon
 ConfigFlags.Trigger.doCalo = opt.doCalo