diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py index 452c9c3cb7c13b481326699f89089db07088c7dd..f4116020bd9cdff56d8e509835f1b20b39b7f581 100755 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py @@ -857,6 +857,11 @@ class ItemDef: LVL1MenuItem('L1_XE60_BGRP7').setLogic( XE60 & bgrp7cond).setTriggerType(TT.calo) # noqa: F821 LVL1MenuItem('L1_XE70_BGRP7').setLogic( XE70 & bgrp7cond).setTriggerType(TT.calo) # noqa: F821 LVL1MenuItem('L1_XE80_BGRP7').setLogic( XE80 & bgrp7cond).setTriggerType(TT.calo) # noqa: F821 + + if '_v8' in TriggerFlags.triggerMenuSetup(): + LVL1MenuItem('L1_XE40.0ETA24').setLogic( XE400ETA24 & physcond).setTriggerType(TT.calo) # noqa: F821 + LVL1MenuItem('L1_XE50.0ETA24').setLogic( XE500ETA24 & physcond).setTriggerType(TT.calo) # noqa: F821 + LVL1MenuItem('L1_XE60.0ETA24').setLogic( XE600ETA24 & physcond).setTriggerType(TT.calo) # noqa: F821 # XS LVL1MenuItem('L1_XS20').setLogic( XS20.x(1) & physcond).setTriggerType(TT.calo) # noqa: F821 LVL1MenuItem('L1_XS30').setLogic( XS30.x(1) & physcond).setTriggerType(TT.calo) # noqa: F821 diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v8.py index 77787e6fce04f27c04e2bda0f6ddcf81a0d109f7..b728b216e2b6a8a72dc6a1a1161a058697167f7b 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v8.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v8.py @@ -149,7 +149,10 @@ def defineMenu(): # 16 x 1-bit thresholds # 8 x weighted sum ET - #'RXE35', 'RXE40', 'RXE45', 'RXE50', 'RXE55', 'RXE60', 'RXE70', 'RXE80', # FTHR +# 'RXE35', 'RXE40', 'RXE45', 'RXE50', 'RXE55', 'RXE60', 'RXE70', 'RXE80', # FTHR + + # ATR-22426 - only three new restricted eta XE + 'XE40.0ETA24','XE50.0ETA24','XE60.0ETA24', # 8 x restricted eta range #'TE3.0ETA24', 'TE5.0ETA24','TE10.0ETA24', 'TE15.0ETA24', 'TE20.0ETA24', 'TE25.0ETA24', 'TE30.0ETA24', 'TE40.0ETA24', @@ -644,13 +647,16 @@ def defineMenu(): # XE "L1_XE35", "L1_XE40", "L1_XE45", "L1_XE50", "L1_XE55", "L1_XE60", - 'L1_XE30', 'L1_XE300', - 'L1_gXERHO50', - 'L1_gXEPUFIT50', - 'L1_gXERHO20', - 'L1_gXEPUFIT20', - 'L1_gXE50', - 'L1_jXE50', + 'L1_XE30', 'L1_XE300', + 'L1_gXERHO50', + 'L1_gXEPUFIT50', + 'L1_gXERHO20', + 'L1_gXEPUFIT20', + 'L1_gXE50', + 'L1_jXE50', + 'L1_XE40.0ETA24', + 'L1_XE50.0ETA24', + 'L1_XE60.0ETA24', #XS 'L1_EM12_XS20', 'L1_EM15_XS30', @@ -1196,6 +1202,11 @@ def defineMenu(): 'L1_XE50' : 147, 'L1_XE55' : 148, 'L1_XE60' : 149, + 'L1_XE40.0ETA24' : 252, + 'L1_XE50.0ETA24' : 253, + 'L1_XE60.0ETA24' : 254, + + 'L1_gXERHO20' : 177, 'L1_gXERHO50' : 30, 'L1_gXEPUFIT20' : 174, diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py index 7a24b99a3451a76ea99b5421072780f41887c905..0a07ed2a5c63c9a6375bac5c5300540e6a2dd963 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py @@ -377,6 +377,13 @@ def setupMenu(): ['xe125_trkmht_L1XE50', 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], ['xe130_trkmht_L1XE50', 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], ['xe135_trkmht_L1XE50', 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + + # ATR-22426 + ['xe110_pufit_L1XE40.0ETA24', 'L1_XE40.0ETA24', [], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1], + ['xe110_pufit_L1XE50.0ETA24', 'L1_XE50.0ETA24', [], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1], + ['xe110_pufit_L1XE60.0ETA24', 'L1_XE60.0ETA24', [], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1], + + ] TriggerFlags.TauSlice.signatures = TriggerFlags.TauSlice.signatures() + [ diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v8.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v8.py index 07fe0a873e36a310ca455ec5430dba1d3ed71714..e49a4dc1d0e20716c5f938a10ca8c59e8445d35f 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v8.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v8.py @@ -797,7 +797,6 @@ def setupMenu(): ['xe110_pufit_xe65_L1XE60', 'L1_XE60', ['L1_XE60','L1_XE60'], [PhysicsStream], ['Legacy:Backup','RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_pufit','x65_L1XE60'] ]], ['xe110_pufit_xe70_L1XE60', 'L1_XE60', ['L1_XE60','L1_XE60'], [PhysicsStream], ['Legacy:Backup','RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_pufit','x70_L1XE60'] ]], ['xe110_pufit_xe75_L1XE60', 'L1_XE60', ['L1_XE60','L1_XE60'], [PhysicsStream], ['Legacy:Backup','RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_pufit','x75_L1XE60'] ]], - ] if TriggerFlags.doFTK(): diff --git a/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt index 7d5eb53ce9bf10b19db96119491efe2d0a700567..415acdd1c26f7b3deea7a8c23dd38fc91962482b 100644 --- a/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt +++ b/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt @@ -146,8 +146,8 @@ atlas_build_trigger_menu( Physics_HI_v4 PYTHON_SOURCES ${Physics_HI_v4_sources} atlas_build_trigger_menu( MC_HI_v4 PYTHON_SOURCES ${MC_HI_v4_sources} ) atlas_build_trigger_menu( MC_HI_v4_tight_mc_prescale PYTHON_SOURCES ${MC_HI_v4_sources} ) -atlas_build_trigger_menu( Physics_HI_v3 ) -atlas_build_trigger_menu( MC_HI_v3 ) -atlas_build_trigger_menu( MC_HI_v3_tight_mc_prescale ) +#atlas_build_trigger_menu( Physics_HI_v3 ) +#atlas_build_trigger_menu( MC_HI_v3 ) +#atlas_build_trigger_menu( MC_HI_v3_tight_mc_prescale ) #atlas_build_trigger_menu( MC_PhaseII )