Skip to content
Snippets Groups Projects
Commit c74d1c8e authored by Tim Martin's avatar Tim Martin
Browse files

Hybrid mode, avoid adding the Tool twice

parent 6b4771d6
No related branches found
No related tags found
5 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!43640Update TDT config to use consistent CA setup
...@@ -120,14 +120,15 @@ if data_type == 'pool': ...@@ -120,14 +120,15 @@ if data_type == 'pool':
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter() cfg = TriggerConfigGetter()
from AthenaCommon.Configurable import Configurable if not hasattr(ToolSvc, 'TrigDecisionTool'):
from AthenaConfiguration.ComponentAccumulator import appendCAtoAthena from AthenaCommon.Configurable import Configurable
from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.ComponentAccumulator import appendCAtoAthena
Configurable.configurableRun3Behavior += 1 from AthenaConfiguration.AllConfigFlags import ConfigFlags
from TrigDecisionTool.TrigDecisionToolConfig import getTrigDecisionTool Configurable.configurableRun3Behavior += 1
acc = getTrigDecisionTool(ConfigFlags) from TrigDecisionTool.TrigDecisionToolConfig import getTrigDecisionTool
appendCAtoAthena( acc ) acc = getTrigDecisionTool(ConfigFlags)
Configurable.configurableRun3Behavior -= 1 appendCAtoAthena( acc )
Configurable.configurableRun3Behavior -= 1
# enable slices for monitoring # enable slices for monitoring
# otherwise enable slices via monFlags # otherwise enable slices via monFlags
......
...@@ -29,14 +29,16 @@ class T0TriggerGetter(Configured): ...@@ -29,14 +29,16 @@ class T0TriggerGetter(Configured):
cfg = TriggerConfigGetter() # noqa: F841 cfg = TriggerConfigGetter() # noqa: F841
# preconfigure TrigDecisionTool # preconfigure TrigDecisionTool
from AthenaCommon.Configurable import Configurable from AthenaCommon.AppMgr import ToolSvc
from AthenaConfiguration.ComponentAccumulator import appendCAtoAthena if not hasattr(ToolSvc, 'TrigDecisionTool'):
from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior += 1 from AthenaConfiguration.ComponentAccumulator import appendCAtoAthena
from TrigDecisionTool.TrigDecisionToolConfig import getTrigDecisionTool from AthenaConfiguration.AllConfigFlags import ConfigFlags
acc = getTrigDecisionTool(ConfigFlags) Configurable.configurableRun3Behavior += 1
appendCAtoAthena( acc ) from TrigDecisionTool.TrigDecisionToolConfig import getTrigDecisionTool
Configurable.configurableRun3Behavior -= 1 acc = getTrigDecisionTool(ConfigFlags)
appendCAtoAthena( acc )
Configurable.configurableRun3Behavior -= 1
if withLVL1(): if withLVL1():
......
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