From 07a5e55477adf188c194ae59a307316bce99a13e Mon Sep 17 00:00:00 2001
From: Francesca Pastore <francesca.pastore@cern.ch>
Date: Mon, 31 Aug 2020 20:06:36 +0200
Subject: [PATCH] fix emu_menu test as in ATR-21963
---
.../python/EmuStepProcessingConfig.py | 3 +--
.../share/EmuStepProcessingTest.py | 18 +++++++++++-------
.../python/HLTMenuConfig/Menu/LS2_emu_v1.py | 1 +
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Trigger/TrigSteer/DecisionHandling/python/EmuStepProcessingConfig.py b/Trigger/TrigSteer/DecisionHandling/python/EmuStepProcessingConfig.py
index 9b1168b0e8de..857f58fdae76 100644
--- a/Trigger/TrigSteer/DecisionHandling/python/EmuStepProcessingConfig.py
+++ b/Trigger/TrigSteer/DecisionHandling/python/EmuStepProcessingConfig.py
@@ -59,8 +59,7 @@ def generateEmuMenu():
log = logging.getLogger('EmuMenuTest')
log.debug("generateEmuMenu")
- # overwrite LS2_v1 menu
- TriggerFlags.triggerMenuSetup = 'LS2_v1'
+ # overwrite LS2_v1
LS2_v1.setupMenu = LS2_emu_v1.setupMenu
# switch on only TestSlice
diff --git a/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py b/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py
index 54592624487f..921417da2c9f 100644
--- a/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py
+++ b/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py
@@ -42,6 +42,17 @@ for option in defaultOptions:
TriggerFlags.generateMenuDiagnostics=True
+from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc, getL1ConfigSvc
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
+ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup= 'LS2_v1'
+
+svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags))
+svcMgr += conf2toConfigurable( getL1ConfigSvc(ConfigFlags))
+
+
topSequence = AlgSequence()
if opt.doMenu is True:
@@ -51,14 +62,7 @@ else:
generateJSON()
-from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc, getL1ConfigSvc
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup = "LS2_v1"
-svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags))
-svcMgr += conf2toConfigurable( getL1ConfigSvc(ConfigFlags))
from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
index 1945ec179415..394337c2cb2c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
@@ -86,6 +86,7 @@ def setupMenu():
TriggerFlags.EnhancedBiasSlice.signatures = [ ]
addSliceChainsToPrescales(TriggerFlags, Prescales.HLTPrescales_cosmics)
+ return Prescales
class Prescales(object):
# Item name | Prescale
--
GitLab