Merge branch 'ATR18763' into '21.1'

update generateL1TopoMenu.py (ATR-18763)

See merge request atlas/athena!15257

Former-commit-id: 8c8844a61f2888d4dc10d03bbb2cebc11b09c16c

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py

@@ -1028,7 +1028,7 @@ class triggerMenuSetup(JobProperty):
         'Physics_HI_v2', 'Physics_HI_v2_no_prescale', 
         'MC_HI_v2',  'MC_HI_v2_no_prescale', 'MC_HI_v2_pPb_mc_prescale',
         #
-        'Physics_default', 'MC_loose_default', 'MC_tight_default',
+        'Physics_default', 'MC_loose_default', 'MC_tight_default', 'default_loose', 'default_tight',
         # -----------------------------------------------------------------
         # Run 2
         'MC_pp_v5', 'MC_pp_v5_no_prescale', 'MC_pp_v5_tight_mc_prescale', 'MC_pp_v5_loose_mc_prescale','MC_pp_v5_special_mc_prescale', # for development and simulation

Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py

@@ -13,11 +13,11 @@ def lumi(triggerPythonConfig):
     
     menu_name = TriggerFlags.triggerMenuSetup()
     ## Do some aliasing here
-    if menu_name == 'Physics_default': menu_name = 'Physics_pp_v6'
-    elif menu_name == 'MC_loose_default': menu_name = 'MC_pp_v6_loose_mc_prescale'
-    elif menu_name == 'MC_tight_default': menu_name = 'MC_pp_v6_tight_mc_prescale'
-    elif menu_name == 'default_loose': menu_name = 'MC_pp_v6_loose_mc_prescale'
-    elif menu_name == 'default_tight': menu_name = 'MC_pp_v6_tight_mc_prescale'
+    if menu_name == 'Physics_default': menu_name = 'Physics_pp_v7'
+    elif menu_name == 'MC_loose_default': menu_name = 'MC_pp_v7_loose_mc_prescale'
+    elif menu_name == 'MC_tight_default': menu_name = 'MC_pp_v7_tight_mc_prescale'
+    elif menu_name == 'default_loose': menu_name = 'MC_pp_v7_loose_mc_prescale'
+    elif menu_name == 'default_tight': menu_name = 'MC_pp_v7_tight_mc_prescale'
 
     log.info( 'Menu name: '+ menu_name)
 

Trigger/TriggerCommon/TriggerMenu/scripts/generateL1TopoMenu.py

@@ -43,13 +43,21 @@ def main():
     if sys.argv[1] in ["Physics_HI_v5", "MC_HI_v5","Physics_HI_v4", "MC_HI_v4", "LS1_v1", "DC14","Physics_pp_v7", "MC_pp_v7","Physics_pp_v6", "MC_pp_v6", "MC_PhaseII"]: # explicit names for TMXML nightly
         generateL1TopoMenu(menu=sys.argv[1])
         return 0
+    
+    tmp_menu = sys.argv[1].lower()
 
-    if sys.argv[1].lower().startswith("ph"): # for interactive production
-        generateL1TopoMenu(menu="Physics_pp_v6")
+    if tmp_menu.startswith("ph"): # for interactive production
+        if 'v6' in tmp_menu:
+            generateL1TopoMenu(menu="Physics_pp_v6")
+        else:
+            generateL1TopoMenu(menu="Physics_pp_v7")
         return 0
 
-    if sys.argv[1].lower().startswith("mc"):
-        generateL1TopoMenu(menu="MC_pp_v6")
+    if tmp_menu.startswith("mc"):
+        if 'v6' in tmp_menu:
+            generateL1TopoMenu(menu="MC_pp_v6")
+        else:
+            generateL1TopoMenu(menu="MC_pp_v7")
         return 0
 
     if sys.argv[1].lower().startswith("hiph"):