From 2fe675421dc00efe2c461f24651bef038d1440ce Mon Sep 17 00:00:00 2001 From: lixia Date: Thu, 31 Oct 2019 10:50:14 +0100 Subject: [PATCH 1/2] update scripts/generate*L1*.py for run3 menus (ATR-20460) --- .../TriggerMenuMT/CMakeLists.txt | 3 +++ .../HLTMenuConfig/Menu/MenuPrescaleConfig.py | 14 +++++++++++ .../scripts/generateL1MenuRun3.py | 3 +++ .../scripts/generateL1TopoMenuMT.py | 5 +++- .../scripts/generateLVL1MenuMT.py | 23 ++++++++++++++++++- 5 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt index 29db99e46e3..dbab90c3f9b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt +++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt @@ -132,6 +132,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 ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py index 73925e149f5..7790b18b400 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 d07391641c9..c5b1c947fb7 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py @@ -61,6 +61,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" ), ("hiphy4","Physics_HI_v4"), ("hiphy", "Physics_HI_v4"), ("himc4", "MC_HI_v4" ), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py index 0e45dac9079..48c8c732901 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1TopoMenuMT.py @@ -31,9 +31,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 efa5ab258bb..cd07f5db433 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py @@ -88,7 +88,7 @@ def findRequiredItemsFromXML(): from TriggerJobOpts.TriggerFlags import TriggerFlags as TF from TriggerMenu.l1.Lvl1Flags import Lvl1Flags - menus = ['Physics_pp_v7','MC_pp_v7','LS2_v1'] + menus = ['Physics_pp_v7','MC_pp_v7','LS2_v1', 'Physics_pp_run3_v1', 'PhysicsP1_pp_run3_v1', 'MC_pp_run3_v1' ] from TriggerMenu.l1.XMLReader import L1MenuXMLReader @@ -151,11 +151,16 @@ def main(): if arg.lower().startswith("doftk"): FTKFlag = True + print 'sys.argv =',sys.argv + if len(sys.argv)==1 or (len(sys.argv)==2 and FTKFlag): #generateL1Menu(menu="Physics_pp_v7",doFTK=FTKFlag) #generateL1Menu(menu="MC_pp_v7",doFTK=FTKFlag) generateL1Menu(menu="LS2_v1" ) + generateL1Menu(menu="Physics_pp_run3_v1" ) + generateL1Menu(menu="PhysicsP1_pp_run3_v1" ) + generateL1Menu(menu="MC_pp_run3_v1" ) return 0 @@ -163,6 +168,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",doFTK=FTKFlag) if printCabling: @@ -207,6 +227,7 @@ def main(): menu.printCabling() return 0 + if sys.argv[1].lower().startswith("dc14"): generateL1Menu(menu="DC14",doFTK=FTKFlag,useTopoMenu="Physics_pp_v6") return 0 -- GitLab From 3e32e078efed5d5dc27e77c4cb241aece51083d9 Mon Sep 17 00:00:00 2001 From: lixia Date: Thu, 31 Oct 2019 11:17:18 +0100 Subject: [PATCH 2/2] remove debugging lines --- .../TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py index cd07f5db433..8463a0c87ee 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py @@ -151,8 +151,6 @@ def main(): if arg.lower().startswith("doftk"): FTKFlag = True - print 'sys.argv =',sys.argv - if len(sys.argv)==1 or (len(sys.argv)==2 and FTKFlag): #generateL1Menu(menu="Physics_pp_v7",doFTK=FTKFlag) -- GitLab