From 8124149359ded80b90d1b0aca46f18a2efb9fea3 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Mon, 1 Oct 2018 09:49:27 +0200
Subject: [PATCH] This MR fixes issue with the trigger teste after some menu
pythonutils were moved to TriggerMenuMT. It also switched to the L1 menu from
TriggerMenuMT
---
Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py | 2 +-
Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py | 2 +-
Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py | 2 +-
Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py
index a747b56376d0..6102835e50e7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py
@@ -25,7 +25,7 @@ include("InDetRecExample/InDetRecConditionsAccess.py")
from InDetRecExample.InDetKeys import InDetKeys
# menu components
-from TrigUpgradeTest.MenuComponents import MenuSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
# ===============================================================================================
# L2 Calo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
index 2c5a9fefa010..9b5939e2fcb7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
@@ -39,7 +39,7 @@ from MuonRecExample.MuonRecFlags import muonRecFlags
# menu components
-from TrigUpgradeTest.MenuComponents import MenuSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
### for Control Flow ###
from AthenaCommon.CFElements import parOR, seqAND, seqOR, stepSeq
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
index bb5652decd90..bc582590cb19 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
@@ -8,7 +8,7 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
import AthenaCommon.CfgMgr as CfgMgr
# menu components
-from TrigUpgradeTest.MenuComponents import MenuSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
# ===============================================================================================
# L2 Calo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
index d2252b6be410..83a8057e42fd 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
@@ -17,7 +17,7 @@
#
class opt :
setupForMC = None # force MC setup
- setLVL1XML = 'TriggerMenuXML/LVL1config_Physics_pp_v7.xml'
+ setLVL1XML = 'TriggerMenuMT/LVL1config_LS2_v1.xml' # 'TriggerMenu/LVL1config_Physics_pp_v7.xml' # default for legacy
setDetDescr = None # force geometry tag
setGlobalTag = None # force global conditions tag
useCONDBR2 = True # if False, use run-1 conditions DB
--
GitLab