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


Former-commit-id: 81241493

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

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

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

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