diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py index daae0f5404ca7c1a19825f6f82707e78a1774a14..3fdde13cd53e2140f0717955b7c71ed452edfa47 100755 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py @@ -200,6 +200,7 @@ class ItemDef: LVL1MenuItem('L1_MU11' ).setLogic( d.MU11 & physcond).setTriggerType(TT.muon) LVL1MenuItem('L1_MU15' ).setLogic( d.MU15 & physcond).setTriggerType(TT.muon) LVL1MenuItem('L1_MU20' ).setLogic( d.MU20 & physcond).setTriggerType(TT.muon) + LVL1MenuItem('L1_MU21' ).setLogic( d.MU21 & physcond).setTriggerType(TT.muon) # 2xMU, 3xMU, 4xMU LVL1MenuItem('L1_2MU0' ).setLogic( d.MU0.x(2) & physcond).setTriggerType(TT.muon) diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py index 288a9303e174b5f88f7a84a07880b180720d66fd..97ae04dc8c5118fca2d75af83697037f91653db3 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py @@ -139,7 +139,7 @@ def defineMenu(): #------------------------ # 6 x MU - 'MU4', 'MU6', 'MU10', 'MU11', 'MU15', 'MU20', + 'MU4', 'MU6', 'MU10', 'MU11', 'MU20', 'MU21', #------------------------ @@ -390,7 +390,7 @@ def defineMenu(): #'L1_JJ15.23ETA49', # 4x4 window # single MU - "L1_MU4", "L1_MU6", "L1_MU10", "L1_MU11", "L1_MU15", "L1_MU20", + "L1_MU4", "L1_MU6", "L1_MU10", "L1_MU11", "L1_MU20", "L1_MU21", "L1_MU4_EMPTY", "L1_MU6_EMPTY", "L1_MU4_FIRSTEMPTY", "L1_MU11_EMPTY", 'L1_MU4_UNPAIRED_ISO','L1_MU4_UNPAIRED_NONISO', @@ -727,8 +727,6 @@ def defineMenu(): 'L1_LFV-MU6', 'L1_LFV-EM8I', 'L1_LFV-EM15I', - 'L1_EM7_MU15', - 'L1_EM8VH_MU15', 'L1_DPHI-J20s2XE50', 'L1_J40_XE50_DPHI-J20s2XE50', 'L1_DPHI-J20XE50', @@ -877,7 +875,6 @@ def defineMenu(): #item with FTK trigger type, for FTK commissioning 'L1_MU6_FTK', - 'L1_MU15_FTK', 'L1_MU20_FTK', 'L1_TAU12IM_FTK', 'L1_TAU20IM_FTK', @@ -919,8 +916,8 @@ def defineMenu(): 'L1_MU6' : 15, 'L1_MU10' : 16, 'L1_MU11' : 256, - 'L1_MU15' : 17, 'L1_MU20' : 18, + 'L1_MU21' : 17, 'L1_MU4_EMPTY' : 19, 'L1_MU6_EMPTY' : 66, 'L1_MU4_FIRSTEMPTY' : 20, @@ -1338,8 +1335,6 @@ def defineMenu(): 'L1_LFV-MU6' : 332, 'L1_LFV-EM8I' : 320, 'L1_LFV-EM15I' : 321, - 'L1_EM7_MU15' : 322, - 'L1_EM8VH_MU15' : 48, 'L1_DPHI-J20s2XE50' : 323, 'L1_DPHI-J20XE50' : 324, 'L1_DPHI-CJ20XE50' : 325, @@ -1537,7 +1532,6 @@ def defineMenu(): 'L1_MU6_FTK' : 499, - 'L1_MU15_FTK' : 497, 'L1_MU20_FTK' : 500, 'L1_TAU12IM_FTK' : 501, 'L1_TAU20IM_FTK' : 86, diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py index 34fffd254a838b950826ae9e3645a659a0ada85e..97c7aa8492663cadff25cec9bd970464f7e4211d 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py @@ -19,7 +19,7 @@ class ThresholdDef: # MUON ThresholdValue.setDefaults('MUON', {'etamin' : -49,'etamax' : 49, 'phimin' : 0,'phimax' : 64}) # keep this as an example how defaults for groups can be defined - for thrV in [0, 4, 6, 10, 11, 15, 20]: + for thrV in [0, 4, 6, 10, 11, 15, 20, 21]: tc.registerThr('MU%i' % thrV, 'MUON').addThrValue(thrV) diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py index 225747b3cdbc83ce12c9a059e1cf3cf8707b2099..7aad261158046eca511110c1ceb32db44ba5a22d 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py @@ -288,7 +288,7 @@ def getL1ALFA_ELAS(l1seed): ##################################### def getL1LowLumi(l1seed): - L1LowLumi_seeds = 'L1_EM20VH,L1_2EM10VH,L1_MU15,L1_2MU6,L1_3MU4,L1_EM15VH_MU10,L1_EM15I_MU4,L1_EM7_MU10,L1_2EM8VH_MU10,L1_TAU60,L1_TAU20IM_2TAU12IM_J25_2J20_3J12,L1_EM15HI_2TAU12IM_XE35,L1_MU10_TAU12IM_XE35,L1_TAU20_2TAU12_XE35,L1_TAU20IM_2TAU12IM_XE35,L1_EM15HI_2TAU12IM,L1_EM15HI_2TAU12IM_J25_3J12,L1_EM15HI_TAU40_2TAU15,L1_MU10_TAU12IM_J25_2J12,L1_MU10_TAU12IM,L1_J75,L1_4J15,L1_XE50,L1_3J25.0ETA23,L1_3J40,L1_2J15_XE55,L1_MU6_J40,L1_J75.31ETA49' + L1LowLumi_seeds = 'L1_EM20VH,L1_2EM10VH,L1_MU21,L1_2MU6,L1_3MU4,L1_EM15VH_MU10,L1_EM15I_MU4,L1_EM7_MU10,L1_2EM8VH_MU10,L1_TAU60,L1_TAU20IM_2TAU12IM_J25_2J20_3J12,L1_EM15HI_2TAU12IM_XE35,L1_MU10_TAU12IM_XE35,L1_TAU20_2TAU12_XE35,L1_TAU20IM_2TAU12IM_XE35,L1_EM15HI_2TAU12IM,L1_EM15HI_2TAU12IM_J25_3J12,L1_EM15HI_TAU40_2TAU15,L1_MU10_TAU12IM_J25_2J12,L1_MU10_TAU12IM,L1_J75,L1_4J15,L1_XE50,L1_3J25.0ETA23,L1_3J40,L1_2J15_XE55,L1_MU6_J40,L1_J75.31ETA49' # check if all the l1 background seeds given are in the current L1 menu