From 132bee05a15d3f11198102c9d925eb1273d5ea1d Mon Sep 17 00:00:00 2001
From: Joerg Stelzer <joerg.stelzer@cern.ch>
Date: Sun, 16 Feb 2020 13:30:28 +0100
Subject: [PATCH] Fix configuration of prescaling with new JO
---
Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py | 3 ++-
.../TriggerJobOpts/python/TriggerConfigFlags.py | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py b/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
index a5ebc2e008b..422f28bd146 100644
--- a/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
+++ b/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
@@ -163,8 +163,9 @@ def L1DecoderCfg(flags):
decoderAlg.DoCostMonitoring = flags.Trigger.CostMonitoring.doCostMonitoring
decoderAlg.CostMonitoringChain = flags.Trigger.CostMonitoring.chain
- from TrigConfigSvc.TrigConfigSvcConfig import TrigConfigSvcCfg
+ from TrigConfigSvc.TrigConfigSvcCfg import TrigConfigSvcCfg, HLTPrescaleCondAlgCfg
acc.merge( TrigConfigSvcCfg( flags ) )
+ acc.merge( HLTPrescaleCondAlgCfg( flags ) )
# Add the algorithm producing the input RoIBResult
from TrigT1ResultByteStream.TrigT1ResultByteStreamConfig import RoIBResultDecoderCfg, L1TriggerResultMakerCfg
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 52666aaf1af..59f3ea083c3 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -89,8 +89,9 @@ def createTriggerFlags():
# use or not frontier proxies
flags.addFlag('Trigger.triggerUseFrontier', False)
- # the configuration name, see TriggerFlags for full info
- flags.addFlag('Trigger.triggerConfig', 'MCRECO:DEFAULT')
+ # the configuration source
+ # see https://twiki.cern.ch/twiki/bin/view/Atlas/TriggerConfigFlag
+ flags.addFlag('Trigger.triggerConfig', 'FILE')
# name of the trigger menu
flags.addFlag('Trigger.triggerMenuSetup', 'LS2_v1')
--
GitLab