Merge branch 'recexcommon-no-trig' into 'master'

Disable Trigger in RecExCommon unless really needed

See merge request !39114

Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py

@@ -554,42 +554,57 @@ if rec.readESD() and rec.doESD():
     rec.doTrigger=False
     recAlgs.doTrigger=False
     logRecExCommon_topOptions.info("detected re-reconstruction from ESD, will switch trigger OFF !")
-#try:
+
+# Disable Trigger output reading in MC if there is none, unless running Trigger selection algorithms
+if not globalflags.InputFormat.is_bytestream() and not recAlgs.doTrigger:
+    try:
+        from RecExConfig.ObjKeyStore import cfgKeyStore
+        from PyUtils.MetaReaderPeeker import convert_itemList
+        cfgKeyStore.addManyTypesInputFile(convert_itemList(layout='#join'))
+        # Check for Run-1, Run-2 or Run-3 Trigger content in the input file
+        if not cfgKeyStore.isInInputFile("HLT::HLTResult", "HLTResult_EF") \
+                and not cfgKeyStore.isInInputFile("xAOD::TrigNavigation", "TrigNavigation") \
+                and not cfgKeyStore.isInInputFile("xAOD::TrigCompositeContainer", "HLTNav_Summary"):
+            logRecExCommon_topOptions.info('Disabled rec.doTrigger because recAlgs.doTrigger=False and there is no Trigger content in the input file')
+            rec.doTrigger = False
+    except Exception:
+        logRecExCommon_topOptions.warning('Failed to check input file for Trigger content, leaving rec.doTrigger value unchanged (%s)', rec.doTrigger)
+
 if rec.doTrigger:
-    if globalflags.DataSource() == 'data'and globalflags.InputFormat == 'bytestream':
+    if globalflags.DataSource() == 'data' and globalflags.InputFormat == 'bytestream':
         try:
             include("TriggerJobOpts/BStoESD_Tier0_HLTConfig_jobOptions.py")
         except Exception:
             treatException("Could not import TriggerJobOpts/BStoESD_Tier0_HLTConfig_jobOptions.py . Switching trigger off !" )
-            recAlgs.doTrigger=False
+            rec.doTrigger = recAlgs.doTrigger = False
     else:
         try:
             from TriggerJobOpts.TriggerGetter import TriggerGetter
             triggerGetter = TriggerGetter()
         except Exception:
             treatException("Could not import TriggerJobOpts.TriggerGetter . Switched off !" )
-            recAlgs.doTrigger=False
-
-# Run-3 Trigger Outputs: Don't run any trigger - only pass the HLT contents from ESD to AOD
-if rec.readESD() and rec.doAOD():
-    from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    # The simplest protection in case ConfigFlags.Input.Files is not set, doesn't cover all cases:
-    if ConfigFlags.Input.Files == ['_ATHENA_GENERIC_INPUTFILE_NAME_'] and athenaCommonFlags.FilesInput():
-        ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
-
-    if ConfigFlags.Trigger.EDMVersion == 3:
-        # Add HLT output
-        from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
-        hltOutput = HLTTriggerResultGetter()
-        # Add Trigger menu metadata
-        if rec.doFileMetaData():
-            from RecExConfig.ObjKeyStore import objKeyStore
-            metadataItems = [ "xAOD::TriggerMenuContainer#TriggerMenu",
-                              "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
-            objKeyStore.addManyTypesMetaData( metadataItems )
-        # Add L1 output (to be consistent with R2)
-        from TrigEDMConfig.TriggerEDM import getLvl1AODList
-        objKeyStore.addManyTypesStreamAOD(getLvl1AODList())
+            rec.doTrigger = recAlgs.doTrigger = False
+
+    # ESDtoAOD Run-3 Trigger Outputs: Don't run any trigger - only pass the HLT contents from ESD to AOD
+    if rec.readESD() and rec.doAOD():
+        from AthenaConfiguration.AllConfigFlags import ConfigFlags
+        # The simplest protection in case ConfigFlags.Input.Files is not set, doesn't cover all cases:
+        if ConfigFlags.Input.Files == ['_ATHENA_GENERIC_INPUTFILE_NAME_'] and athenaCommonFlags.FilesInput():
+            ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
+
+        if ConfigFlags.Trigger.EDMVersion == 3:
+            # Add HLT output
+            from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
+            hltOutput = HLTTriggerResultGetter()
+            # Add Trigger menu metadata
+            if rec.doFileMetaData():
+                from RecExConfig.ObjKeyStore import objKeyStore
+                metadataItems = [ "xAOD::TriggerMenuContainer#TriggerMenu",
+                                "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
+                objKeyStore.addManyTypesMetaData( metadataItems )
+            # Add L1 output (to be consistent with R2)
+            from TrigEDMConfig.TriggerEDM import getLvl1AODList
+            objKeyStore.addManyTypesStreamAOD(getLvl1AODList())
 
 AODFix_postTrigger()
 

Reconstruction/RecExample/RecExConfig/python/RecAlgsFlags.py

@@ -102,9 +102,11 @@ class doEgammaBremReco(JobProperty):
     StoredValue=False 
 class doTrigger(JobProperty):
     """ Switch for trigger"""
+    # TODO: Remove this flag and assume False in all client configuration
+    # once the Run-2 trigger execution is removed from release 22
     statusOn=True 
     allowedTypes=['bool']
-    StoredValue=True 
+    StoredValue=False
 class doAtlfast(JobProperty):
     """ Switch for fast simulation (but normally run at ESD->AOD stage)"""
     statusOn=True

Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py

@@ -52,21 +52,11 @@ if hasattr(runArgs,"outputAODFile"):
     rec.doAOD.set_Value_and_Lock( True )
     rec.doWriteAOD.set_Value_and_Lock( True ) 
     athenaCommonFlags.PoolAODOutput.set_Value_and_Lock( runArgs.outputAODFile )
-    # Begin temporary block for Run-3 Trigger outputs
-    if ConfigFlags.Trigger.EDMVersion == 3:
-        # Lock DQ configuration to prevent downstream override
-        from AthenaMonitoring.DQMonFlags import DQMonFlags
-        print('DQMonFlags override')
-        if not rec.doTrigger():
-            DQMonFlags.useTrigger.set_Value_and_Lock(False)
-        if DQMonFlags.useTrigger() and rec.doTrigger():
-            DQMonFlags.useTrigger.set_Value_and_Lock(True)
-        # Don't run any trigger - only pass the HLT contents from ESD to AOD
-        # Configure here, and extract HLT content in RecExCommon_topOptions
-        # after the rest of the job is configured
-        from RecExConfig.RecAlgsFlags import recAlgs
-        recAlgs.doTrigger.set_Value_and_Lock( False )
-        rec.doTrigger.set_Value_and_Lock( False )
+    # Lock DQ configuration to prevent downstream override
+    # RB 15/12/2020: This logic was added in !36737, not sure if still needed
+    from AthenaMonitoring.DQMonFlags import DQMonFlags
+    print('DQMonFlags.useTrigger override')
+    DQMonFlags.useTrigger.set_Value_and_Lock(rec.doTrigger() and DQMonFlags.useTrigger())
 
 if hasattr(runArgs,"outputTAGFile"):
     # should be used as outputTAGFile_e2a=myTAG.root so that it does not trigger AODtoTAG

Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py

@@ -13,7 +13,9 @@ def setMinimalCaloSetup() :
     svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
   if not hasattr(svcMgr,'RegSelSvcDefault'):
     from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
-    svcMgr += RegSelSvcDefault()
+    regsel = RegSelSvcDefault()
+    regsel.enableCalo = True
+    svcMgr += regsel
 
 
 

Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py

@@ -63,7 +63,9 @@ def HLTCaloMonitoringTool():
     from AthenaCommon.AppMgr import ServiceMgr
     if not hasattr(ServiceMgr,"RegSelSvcDefault"):
         from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
-        ServiceMgr += RegSelSvcDefault()
+        regsel = RegSelSvcDefault()
+        regsel.enableCalo = True
+        ServiceMgr += regsel
 
     #HLTFullCalo = HLTCaloTool(name             = 'HLTFullCalo',
     #                                histoPathBase    = "/Trigger/HLT")

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py

@@ -145,7 +145,9 @@ class HLTSimulationGetter(Configured):
         log.info("Loading RegionSelector")
         from AthenaCommon.AppMgr import ServiceMgr
         from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
-        ServiceMgr += RegSelSvcDefault()
+        regsel = RegSelSvcDefault()
+        regsel.enableCalo = TriggerFlags.doCalo()
+        ServiceMgr += regsel
 
         # Configure the Data Preparation for Calo
         if TriggerFlags.doCalo():

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py

@@ -8,7 +8,6 @@ from AthenaCommon.GlobalFlags import globalflags
 from AthenaCommon.AppMgr import ServiceMgr
 from RecExConfig.Configured import Configured
 
-from RecExConfig.RecAlgsFlags import recAlgs
 from RecExConfig.RecFlags import rec
 
 from TrigRoiConversion.TrigRoiConversionConf import RoiWriter
@@ -305,11 +304,10 @@ class HLTTriggerResultGetter(Configured):
             xaodcnvrt = xAODConversionGetter()
             xAODContainers = xaodcnvrt.xaodlist
 
-        if recAlgs.doTrigger() or TriggerFlags.doTriggerConfigOnly():
-            if ConfigFlags.Trigger.EDMVersion <= 2:
-                tdt = TrigDecisionGetterRun2()  # noqa: F841
-            else:
-                tdt = TrigDecisionGetter()  # noqa: F841
+        if ConfigFlags.Trigger.EDMVersion <= 2 and (rec.doTrigger() or TriggerFlags.doTriggerConfigOnly()):
+            tdt = TrigDecisionGetterRun2()  # noqa: F841
+        elif ConfigFlags.Trigger.EDMVersion >= 3 and TriggerFlags.readBS():
+            tdt = TrigDecisionGetter()  # noqa: F841
 
         # Temporary hack to add Run-3 navigation to ESD and AOD
         if (rec.doESD() or rec.doAOD()) and ConfigFlags.Trigger.EDMVersion == 3:

Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1ResultBuilderGetter.py

@@ -8,7 +8,6 @@ from AthenaCommon.Include import include  # to include old style job options
 from AthenaCommon.AppMgr import theApp
 
 from RecExConfig.RecFlags  import rec
-from RecExConfig.RecAlgsFlags import recAlgs
 
 
 from RecExConfig.Configured import Configured
@@ -41,7 +40,7 @@ class Lvl1ResultBuilderGetter(Configured):
         topSequence = AlgSequence()
 
 
-        if recAlgs.doTrigger():
+        if rec.doTrigger():
             if (rec.doESD() or rec.doAOD()) and (not(rec.readAOD() or \
                                                          rec.readESD())):
                 if jobproperties.Global.InputFormat() == 'bytestream':

Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py

@@ -15,6 +15,11 @@ from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
 from AthenaCommon.AppMgr import ServiceMgr, ToolSvc
 from AthenaCommon.Include import include
 
+assertMsg = 'This file is meant for Trigger configuration in RAWtoESD/RAWtoALL data reconstruction.'
+assert rec.doTrigger(), assertMsg + ' Since rec.doTrigger is disabled, this file should not be included.'
+assert not recAlgs.doTrigger(), assertMsg + \
+    ' Trigger selection should not run in offline reconstruction, so recAlgs.doTrigger should be False'
+
 # First check is HLT psk is ok, if not, turn trigger off.
 if tf.configForStartup() != 'HLToffline':
     include( "TriggerJobOpts/TriggerConfigCheckHLTpsk.py" )
@@ -130,14 +135,13 @@ if rec.doTrigger():
             getattr(ToolSvc, toolName).LVL1ConfigSvc="TrigConf::TrigConfigSvc/TrigConfigSvc"
 
     #---------------------------------------------------------------------------
-    if recAlgs.doTrigger():
-        try:
-            from TriggerJobOpts.T0TriggerGetter import T0TriggerGetter
-            triggerGetter = T0TriggerGetter()
-        except Exception:
-            from AthenaCommon.Resilience import treatException
-            treatException("Could not import TriggerJobOpts.TriggerGetter . Switched off !" )
-            recAlgs.doTrigger=False
-    elif rec.doWriteBS():
+    try:
+        from TriggerJobOpts.T0TriggerGetter import T0TriggerGetter
+        triggerGetter = T0TriggerGetter()
+    except Exception:
+        from AthenaCommon.Resilience import treatException
+        treatException("Could not import TriggerJobOpts.TriggerGetter . Switched off !" )
+        recAlgs.doTrigger=False
+    if rec.doWriteBS():
         include( "ByteStreamCnvSvc/RDP_ByteStream_jobOptions.py" )
 ## end of configure the HLT config