diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
index 2edb16b1603e8be746dead9bc8e8e1b0456effc5..444081a365e6c6bcc508d95cfcc35d9604659894 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
@@ -44,8 +44,9 @@ def defineMenu():
#-------------------------
# 16 x EM
- 'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
-
+ #'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
+ 'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM18VH', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
+
# 1 x ZB
'ZB_J75', # TODO double check if 'ZB_EM15' should be used for Run-2 (need to be changed also in ItemDef).
@@ -54,7 +55,9 @@ def defineMenu():
#--------------------------
# 16 x TAU
- 'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40',
+ #'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40',
+ #'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40',
+ 'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA20IT', 'HA25IT', 'HA30', 'HA40', 'HA60',
#----------------------
# SLOT 8 / CON 0 (JET1)
@@ -91,9 +94,11 @@ def defineMenu():
'TE4', 'TE5', 'TE20', 'TE50', 'TE100', 'TE200', 'TE10000', 'TE12000',
# 8 x XE
- 'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
+ #'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
+ 'XE30', 'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70',
- 'XE35.0ETA24', 'XE40.0ETA24', 'XE45.0ETA24', 'XE50.0ETA24', 'XE55.0ETA24', 'XE60.0ETA24', 'XE70.0ETA24', 'XE80.0ETA24',
+ #'XE35.0ETA24', 'XE40.0ETA24', 'XE45.0ETA24', 'XE50.0ETA24', 'XE55.0ETA24', 'XE60.0ETA24', 'XE70.0ETA24', 'XE80.0ETA24',
+ 'XE30.0ETA24', 'XE35.0ETA24', 'XE40.0ETA24', 'XE45.0ETA24', 'XE50.0ETA24', 'XE55.0ETA24', 'XE60.0ETA24', 'XE70.0ETA24',
# 8 x XS
'XS20', 'XS30', 'XS40', 'XS45', 'XS50', 'XS55', 'XS60', 'XS65',
@@ -353,8 +358,51 @@ def defineMenu():
]
Lvl1Flags.items = [
+ #ATR-18734
+ 'L1_HT190-J15s5.ETA21',
+ #B->K*ee:',
+ 'L1_BPH-0M9-EM7-EM5_2MU4',
+ 'L1_BPH-0M9-EM7-EM5_MU6',
+ 'L1_BPH-0DR3-EM7J15_2MU4',
+ 'L1_BPH-0DR3-EM7J15_MU6',
+ #Jpsi->ee T&P:',
+ 'L1_JPSI-1M5-EM7',
+ 'L1_JPSI-1M5-EM12',
+ #VBF inclusive:',
+ 'L1_MJJ-500-NFF',
+ 'L1_MJJ-700',
+ #VBF H->bb + photon:',
+ 'L1_EM18VH_MJJ-300',
+ #VBF H->bb:',
+ 'L1_HT150-J20s5.ETA31_MJJ-400-CF',
+ #g + tau for excl Higgs decays:',
+ 'L1_30M-EM20ITAU12',
+ #Exotics LLP cal-ratio:',
+ 'L1_LLP-RO',
+ 'L1_LLP-NOMATCH',
+ #SUSY Higgsino:',
+ 'L1_2MU4_J20_XE30_DPHI-J20s2XE30',
+ 'L1_MU4_J30_XE40_DPHI-J20s2XE30',
+ 'L1_MU4_J50_XE50_DPHI-J20s2XE30',
+ 'L1_J40_XE50_DPHI-J20s2XE50',
+ #Axion search:',
+ 'L1_DPHI-2EM3',
+ #LAr:',
+ #'L1_LAR-J',
+ #'L1_LAR-EM',
+ 'L1_LAR-ZEE',
+ 'L1_LAR-ZEE_LAR-EM',
+ #Tau:',
+ 'L1_DR-EM15TAU12I-J25',
+ 'L1_DR-TAU20ITAU12I-J25',
+ 'L1_TAU60_DR-TAU20ITAU12I',
+ #Jet:
+ 'L1_SC111-CJ15',
+ #TLA:',
+ 'L1_J50_DETA20-J50J',
+
'L1_EM7',
- 'L1_EM8',
+ 'L1_EM8',
'L1_EM10',
'L1_EM12',
'L1_EM14',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
index fce30a2ce50acab2b7e5c90ad789c4ec66b33f1b..dc1e0b98ebc1607c9978b58f6a26fa5edb4d9a8c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
@@ -363,7 +363,7 @@ class ThresholdDef:
# RXE (restriced range ET miss)
etamax = 24
- for thrV in [35, 40, 45, 50, 55, 60, 70, 80]:
+ for thrV in [30, 35, 40, 45, 50, 55, 60, 70, 80]:
tc.registerThr('XE%i.0ETA%i' % (thrV, etamax), 'XE').addThrValue(EtMissOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
# Restricted range TE |eta|<4.9
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
index ffd1864fd11aa727b2de73d2aa6323abbf9146cf..460801a138a933956bb99324517a85e88c901250 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
@@ -219,7 +219,7 @@ def setupMenu():
]
TriggerFlags.TauSlice.signatures = [
- ]
+ ]
TriggerFlags.EgammaSlice.signatures = [
@@ -313,7 +313,7 @@ def setupMenu():
#UPC photons
['g12_loose_L1EM7_VTE200', 'L1_EM7_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['g12_medium_L1EM7_VTE200', 'L1_EM7_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-
+
]
TriggerFlags.BphysicsSlice.signatures = [
@@ -354,7 +354,6 @@ def setupMenu():
['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1ZDC_XOR_VTE50', 'L1_ZDC_XOR_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
['hi_upc_FgapAC_mb_sptrk_exclusiveloose1_L1MU4_VTE50', 'L1_MU4_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose1'],False]],
['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1MU4_VTE50', 'L1_MU4_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
-
['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1VZDC_A_C_VTE50', 'L1_VZDC_A_C_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
@@ -759,6 +758,55 @@ def setupMenu():
["noalg_l1topo_L1LAR-EM", "L1_LAR-EM", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
["noalg_l1topo_L1LAR-J", "L1_LAR-J", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 b-jet+HT
+ ["noalg_l1topo_L1HT190-J15s5.ETA21", "L1_HT190-J15s5.ETA21", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 B->K*ee
+ ["noalg_l1topo_L1BPH-0M9-EM7-EM5_2MU4", "L1_BPH-0M9-EM7-EM5_2MU4", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1BPH-0M9-EM7-EM5_MU6", "L1_BPH-0M9-EM7-EM5_MU6", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1BPH-0DR3-EM7J15_2MU4", "L1_BPH-0DR3-EM7J15_2MU4", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1BPH-0DR3-EM7J15_MU6", "L1_BPH-0DR3-EM7J15_MU6", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 jpsi->ee T&P
+ ["noalg_l1topo_L1JPSI-1M5-EM7", "L1_JPSI-1M5-EM7", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1JPSI-1M5-EM12", "L1_JPSI-1M5-EM12", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 VBF inclusive
+ ["noalg_l1topo_L1MJJ-500-NFF", "L1_MJJ-500-NFF", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1MJJ-700", "L1_MJJ-500-NFF", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 VBF H->bb + photon
+ #['noalg_l1topo_L1EM18VHI_MJJ-300', 'L1_EM18VHI_MJJ-300', [], ['L1Topo'], ["RATE:SeededStreamers", "BW:Other"], -1],
+ ['noalg_l1topo_L1EM18VH_MJJ-300', 'L1_EM18VH_MJJ-300', [], ['L1Topo'], ["RATE:SeededStreamers", "BW:Other"], -1],
+ #ATR-18734
+ #["noalg_l1topo_L1HT150-J20s5.ETA31", "L1_HT150-J20s5.ETA31", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1HT150-J20s5.ETA31_MJJ-400-CF", "L1_HT150-J20s5.ETA31_MJJ-400-CF", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+
+ #ATR-18734 g + tau for excl Higgs decays
+ ["noalg_l1topo_L130M-EM20ITAU12", "L1_30M-EM20ITAU12", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 Exotics LLP cal-ratio
+ ["noalg_l1topo_L1LLP-RO", "L1_LLP-RO", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1LLP-NOMATCH", "L1_LLP-NOMATCH", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 SUSY Higgsino
+ ['noalg_l1topo_L12MU4_J20_XE30_DPHI-J20s2XE30', 'L1_2MU4_J20_XE30_DPHI-J20s2XE30', [], ['L1Topo'], ["RATE:SeededStreamers", "BW:Other"], -1],
+ ['noalg_l1topo_L1MU4_J30_XE40_DPHI-J20s2XE30', 'L1_MU4_J30_XE40_DPHI-J20s2XE30', [], ['L1Topo'], ["RATE:SeededStreamers", "BW:Other"], -1],
+ ['noalg_l1topo_L1MU4_J50_XE50_DPHI-J20s2XE30', 'L1_MU4_J50_XE50_DPHI-J20s2XE30', [], ['L1Topo'], ["RATE:SeededStreamers", "BW:Other"], -1],
+ ["noalg_l1topo_L1J40_XE50_DPHI-J20s2XE50", "L1_J40_XE50_DPHI-J20s2XE50", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 Axion search
+ ["noalg_l1topo_L1DPHI-2EM3", "L1_DPHI-2EM3", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 LAr
+ #["noalg_l1topo_L1LAR-J", "L1_LAR-J", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #["noalg_l1topo_L1LAR-EM", "L1_LAR-EM", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ['noalg_l1topo_L1LAR-ZEE', 'L1_LAR-ZEE', [], ['L1Topo'], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+ ['noalg_l1topo_L1LAR-ZEE_LAR-EM', 'L1_LAR-ZEE_LAR-EM', [], ['L1Topo'], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+
+ #ATR-18734 Tau
+ ["noalg_l1topo_L1DR-EM15TAU12I-J25", "L1_DR-EM15TAU12I-J25", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1DR-TAU20ITAU12I-J25", "L1_DR-TAU20ITAU12I-J25", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ ["noalg_l1topo_L1TAU60_DR-TAU20ITAU12I", "L1_TAU60_DR-TAU20ITAU12I", [], ["L1Topo"], ["RATE:L1TopoStream ers", "BW:Other"], -1 ],
+ #ATR-18734 Jets
+ ["noalg_l1topo_L1SC111-CJ15", "L1_SC111-CJ15", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+ #ATR-18734 TLA
+ ["noalg_l1topo_L1J50_DETA20-J50J", "L1_J50_DETA20-J50J", [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+
+
+
]
TriggerFlags.BeamspotSlice.signatures = [