diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt index a15fa81213a2a70d5b85cdb6d437838e2b59c7ce..aea35c58a945d813f55d58378bb66a2cc65c1adf 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt +++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt @@ -133,6 +133,9 @@ atlas_add_test( generateMenuMT SCRIPT bash test_HLTmenu.sh #---------------------------------- # List of menus to be created: atlas_build_lvl1_trigger_menu( LS2_v1 ) +atlas_build_lvl1_trigger_menu( Physics_pp_run3_v1 ) +atlas_build_lvl1_trigger_menu( PhysicsP1_pp_run3_v1 ) +atlas_build_lvl1_trigger_menu( MC_pp_run3_v1 ) atlas_build_lvl1_trigger_menu( Cosmic_pp_run3_v1 ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py index 1545b08dc7ee026848032c9c0dce851f05b0b2c4..52147d0b54b6a8b8d1c496002a3439b6e3ae7a53 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py @@ -64,6 +64,20 @@ def MenuPrescaleConfig(triggerConfigHLT): L1Prescales = Prescales.L1Prescales HLTPrescales = Prescales.HLTPrescales + elif menu_name.startswith('MC_pp_run3_v1'): + log.info('MC_pp_run3_v1 menu setup') + from TriggerMenuMT.HLTMenuConfig.Menu.MC_pp_run3_v1 import setupMenu, Prescales + setupMenu() + if 'cosmics_prescale' in menu_name: + L1Prescales = Prescales.L1Prescales_cosmics + HLTPrescales = Prescales.HLTPrescales_cosmics + elif 'tight_mc_prescale' in menu_name: + L1Prescales = Prescales.L1Prescales_tight_mc_prescale + HLTPrescales = Prescales.HLTPrescales_tight_mc_prescale + else: + L1Prescales = Prescales.L1Prescales + HLTPrescales = Prescales.HLTPrescales + elif menu_name.startswith('LS2_emu_v1'): log.info('LS2_v1 menu setup') diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py index 9e9fc24fed8ff0d070a4313e639a1a7a9fdd8fbc..660e80ceece5def0d086931861f028f6f7d5d14b 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py @@ -58,6 +58,9 @@ def main(): ("mc" , "MC_pp_v8" ), ("mcp" , ["MC_pp_v8_no_prescale", "MC_pp_v8_loose_mc_prescale", "MC_pp_v8_tight_mc_prescale"]), ("ls" , "LS2_v1" ), + ("phyr3v1" , "Physics_pp_run3_v1" ), + ("phyp1r3v1" , "PhysicsP1_pp_run3_v1" ), + ("mcr3v1" , "MC_pp_run3_v1" ), ("cosmic", "Cosmic_pp_run3_v1"), ("hiphy4","Physics_HI_v4"), ("hiphy", "Physics_HI_v4"), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py index fb6c6350bc9eba7616e58b5c8b70f8c6e02d7118..2aef0e0ebaf53375ba24385a27f078810f65ec03 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py @@ -30,9 +30,12 @@ def main(): #generateL1TopoMenu(menu="MC_pp_v7") #generateL1TopoMenu(menu="Physics_pp_v7") generateL1TopoMenu(menu="LS2_v1" ) + generateL1TopoMenu(menu="Physics_pp_run3_v1" ) + generateL1TopoMenu(menu="PhysicsP1_pp_run3_v1" ) + generateL1TopoMenu(menu="MC_pp_run3_v1" ) return 0 - if sys.argv[1] in ["LS2_v1","Physics_pp_v7", "MC_pp_v7"]: # explicit names for TMXML nightly + if sys.argv[1] in ["LS2_v1","Physics_pp_v7", "MC_pp_v7", "Physics_pp_run3_v1", "PhysicsP1_pp_run3_v1", "MC_pp_run3_v1"]: # explicit names for TMXML nightly generateL1TopoMenu(menu=sys.argv[1]) return 0 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py index 5072938db801ea09e28818f2842d63075027b681..c557f68e81bb197e55289840009ef6ac70468c78 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py @@ -76,7 +76,8 @@ def findUnneededRun2(): def findRequiredItemsFromXML(): - menus = ['Physics_pp_v7','MC_pp_v7','LS2_v1','Cosmic_pp_run3_v1'] + + menus = ['Physics_pp_v7','MC_pp_v7','LS2_v1', 'Physics_pp_run3_v1', 'PhysicsP1_pp_run3_v1', 'MC_pp_run3_v1', 'Cosmic_pp_run3_v1'] from TriggerMenu.l1.XMLReader import L1MenuXMLReader @@ -139,6 +140,9 @@ def main(): if len(sys.argv)==1: generateL1Menu(menu="LS2_v1" ) + generateL1Menu(menu="Physics_pp_run3_v1" ) + generateL1Menu(menu="PhysicsP1_pp_run3_v1" ) + generateL1Menu(menu="MC_pp_run3_v1" ) generateL1Menu(menu="Cosmic_pp_run3_v1") return 0 @@ -147,6 +151,21 @@ def main(): readL1MenuFromXML(sys.argv[1]) return 0 + if sys.argv[1].lower().startswith("physics_pp_run3_v1"): + menu = generateL1Menu(menu="Physics_pp_run3_v1") + menu.printCabling() + return 0 + + if sys.argv[1].lower().startswith("physicsp1_pp_run3_v1"): + menu = generateL1Menu(menu="PhysicsP1_pp_run3_v1") + menu.printCabling() + return 0 + + if sys.argv[1].lower().startswith("mc_pp_run3_v1"): + menu = generateL1Menu(menu="MC_pp_run3_v1") + menu.printCabling() + return 0 + if sys.argv[1].lower().startswith("phy6"): menu = generateL1Menu(menu="Physics_pp_v6") if printCabling: