diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index b606da07f6fe43bde71ed3c175a97d35222d1091..a0cd4ffdc0441e718fb1ef82e58dc94515a54408 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/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
diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py b/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py
index 2351ac41e3eca7bfe6254888d2221f47e5efdb1c..248fad1bf0282eb39bbb68479a2ad0759015c013 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py
+++ b/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")
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
index a5b2806068a0f2f277175cade788e023c61f592c..3ff97c437a6bd13b55c14dc39e40014d84da6094 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
+++ b/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():
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
index a7378fe507517ac42094f83b9f23ccc823687df2..1fbbeb989f33fafe686cd277adc82637a5f22dbf 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
+++ b/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:
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1ResultBuilderGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1ResultBuilderGetter.py
index 510671ab213a699f80ba77e6aaba454e1e0fb0f0..f5a3b362b8bb6086447ac733b1e2bfdd5f3dfe51 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1ResultBuilderGetter.py
+++ b/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':
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
index f7245c3d1b15d6721dc297123a6a3b583aa792e7..1b0a6dbd1e827c4592817d7d96e69be9906f0d32 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
+++ b/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