Commit bd093cdd authored by Daniele Zanzi's avatar Daniele Zanzi
Browse files

add 2tau+2j for HH (ATR-20450)

parent d55401ef
......@@ -2202,16 +2202,16 @@ HLT_j85_pf_ftf_L1J20:
stepFeatures:
0: 19
1: 22
HLT_larpebcalib_LArPEBCalib_L1RD0_BGRP11:
eventCount: 0
HLT_larpebcalib_LArPEBCalib_L1RD0_EMPTY:
eventCount: 0
HLT_larnoiseburst_L1XE60:
eventCount: 6
stepCounts:
0: 6
stepFeatures:
0: 6
HLT_larpebcalib_LArPEBCalib_L1RD0_BGRP11:
eventCount: 0
HLT_larpebcalib_LArPEBCalib_L1RD0_EMPTY:
eventCount: 0
HLT_mb_sp_L1RD0_FILLED:
eventCount: 0
HLT_mb_sptrk_L1RD0_FILLED:
......@@ -3658,6 +3658,20 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J2
2: 12
3: 12
4: 8
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1TAU20IM_2TAU12IM_4J12p0ETA25:
eventCount: 1
stepCounts:
0: 5
1: 2
2: 2
3: 2
4: 1
stepFeatures:
0: 25
1: 14
2: 8
3: 8
4: 6
HLT_tau35_mediumRNN_tracktwo_L1TAU12IM:
eventCount: 0
stepCounts:
......
......@@ -2366,6 +2366,13 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J2
stepFeatures:
0: 8
1: 2
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1TAU20IM_2TAU12IM_4J12p0ETA25:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 8
1: 2
HLT_tau35_mediumRNN_tracktwo_L1TAU12IM:
eventCount: 0
stepCounts:
......
......@@ -470,6 +470,9 @@ def setupMenu():
ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=MultiTauGroup),
ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I",l1SeedThresholds=['TAU60','TAU12IM'], groups=MultiTauGroup),
ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup),
# ATR-20450
ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1TAU20IM_2TAU12IM_4J12p0ETA25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup),
]
TriggerFlags.BphysicsSlice.signatures = TriggerFlags.BphysicsSlice.signatures() + [
......
......@@ -181,7 +181,6 @@ class ItemDef:
MenuItem('L1_J50p31ETA49' ).setLogic( d.J5031ETA49 & physcond).setTriggerType(TT.calo)
MenuItem('L1_J70p31ETA49' ).setLogic( d.J7031ETA49 & physcond).setTriggerType(TT.calo)
MenuItem('L1_J12p0ETA23' ).setLogic( d.J120ETA23 & physcond).setTriggerType(TT.calo)
MenuItem('L1_J15p0ETA25' ).setLogic( d.J150ETA25 & physcond).setTriggerType(TT.calo)
MenuItem('L1_J20p0ETA28' ).setLogic( d.J200ETA28 & physcond).setTriggerType(TT.calo)
MenuItem('L1_J25p0ETA23' ).setLogic( d.J250ETA23 & physcond).setTriggerType(TT.calo)
......@@ -484,7 +483,7 @@ class ItemDef:
MenuItem('L1_TAU25IM_2TAU12IM_J25_3J12' ).setLogic( d.HA25IM & d.HA12IM.x(2) & d.J25 & d.J12.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU25IM_2TAU20IM_2J25_3J20').setLogic( d.HA25IM & d.HA20IM.x(2) & d.J25.x(2) & d.J20.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20IM_2TAU12IM_4J12' ).setLogic( d.HA20IM & d.HA12IM.x(2) & d.J12.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20IM_2TAU12IM_4J12p0ETA23').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J120ETA23.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20IM_2TAU12IM_4J12p0ETA25').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J120ETA25.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20IM_2TAU12IM_4J12p0ETA28').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J120ETA28.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU60_2TAU40' ).setLogic( d.HA60 & d.HA40.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_2TAU12I_TAU20_J25_2J15_3J12' ).setLogic( d.HA12I.x(2) & d.HA20 & d.J25 & d.J15.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
......@@ -513,7 +512,7 @@ class ItemDef:
MenuItem('L1_MU10_eTAU12IM_gXERHO35' ).setLogic( d.MU10 & d.eTAU12IM & d.gXERHO35 & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20I_2TAU12I_XE35' ).setLogic( d.HA20I & d.HA12I.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU20IM_2jJ20_gXERHO45' ).setLogic( d.eTAU20IM & d.jJ20.x(2) & d.gXERHO45 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA23').setLogic( d.eTAU20IM & d.eTAU12IM.x(2) & d.jJ120ETA23.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25').setLogic( d.eTAU20IM & d.eTAU12IM.x(2) & d.jJ120ETA25.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20' ).setLogic( d.eTAU25IM & d.eTAU20IM.x(2) & d.jJ25.x(2) & d.jJ20.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU40_2eTAU12IM_gXERHO40' ).setLogic( d.eTAU40 & d.eTAU12IM.x(2) & d.gXERHO40 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU60_2eTAU40' ).setLogic( d.eTAU60 & d.eTAU40.x(2) & physcond).setTriggerType( TT.calo )
......
......@@ -163,7 +163,7 @@ class ThresholdDef:
JetThreshold('jJ%i' % thrV, 'jJ').setPt(thrV).addRange(etamin=-31, etamax=31) # jets are between -31 and 31 -ATR-11526
# Central jet
for (thrV, etamax) in [(12,23), (15,25), (25,23), (35,23), (40,25)]:
for (thrV, etamax) in [(12,25), (15,25), (25,23), (35,23), (40,25)]:
JetThreshold('jJ%ip0ETA%i' % (thrV, etamax), 'jJ').setPt(thrV).addRange(etamin = -etamax, etamax = etamax)
# Standard forward jet
......
......@@ -146,7 +146,7 @@ class ThresholdDefLegacy:
LegacyThreshold('J%iA' % thrV, 'JET').addThrValue(CL.JetOff).addThrValue( thrV, etamin = 15, etamax = 23, priority=1)
LegacyThreshold('J%iC' % thrV, 'JET').addThrValue(CL.JetOff).addThrValue( thrV, etamin = -23, etamax = -15, priority=1)
# Central jet
for (thrV, etamax) in [(12,23), (12,28), (15,25), (17,22), (20,28), (25,23), (35,23), (20,49), (30,49), (40,25), (45,23)]:
for (thrV, etamax) in [(12,25), (12,28), (15,25), (17,22), (20,28), (25,23), (35,23), (20,49), (30,49), (40,25), (45,23)]:
LegacyThreshold('J%ip0ETA%i' % (thrV, etamax), 'JET').addThrValue(CL.JetOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
# Standard forward jet
......
......@@ -36,7 +36,7 @@ class TopoAlgoDefMultiplicity(object):
nbits = 3)
tm.registerTopoAlgo(alg)
jJThresholds = [ "jJ12", "jJ12p0ETA23", "jJ15", "jJ15p0ETA25", "jJ20", "jJ25", "jJ25p0ETA23", "jJ30",
jJThresholds = [ "jJ12", "jJ12p0ETA25", "jJ15", "jJ15p0ETA25", "jJ20", "jJ25", "jJ25p0ETA23", "jJ30",
"jJ35p0ETA23", "jJ40p0ETA25", "jJ40", "jJ50", "jJ85", "jJ100", "jJ15p31ETA49", "jJ20p31ETA49", "jJ75p31ETA49" ]
for jJet in jJThresholds:
......
......@@ -93,12 +93,12 @@ def defineMenu():
# combined tau - jet
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',
'L1_TAU20IM_2TAU12IM_4J12p0ETA23',
'L1_TAU20IM_2TAU12IM_4J12p0ETA25',
'L1_TAU20IM_2TAU12IM_4J12p0ETA28',
'L1_TAU25IM_2TAU20IM_2J25_3J20',
# new calo
'L1_eTAU20IM_2jJ20_gXERHO45',
'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA23',
'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25',
'L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20',
# combined tau - xe
......@@ -420,7 +420,7 @@ def defineMenu():
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12' : 70,
'L1_TAU20IM_2TAU12IM_4J12p0ETA23' : 316,
'L1_TAU20IM_2TAU12IM_4J12p0ETA25' : 316,
'L1_TAU20IM_2J20_XE45' : 74,
'L1_TAU20IM_2TAU12IM_4J12p0ETA28' : 77,
'L1_TAU20IM_2J20_XE50' : 79,
......@@ -729,7 +729,7 @@ def defineMenu():
'L1_MU20_jJ40' : 502,
'L1_MU20_gXERHO30' : 503,
'L1_eTAU20IM_2jJ20_gXERHO45' : 504,
'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA23' : 505,
'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25' : 505,
'L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20' : 506,
'L1_eTAU40_2eTAU12IM_gXERHO40' : 507,
......
......@@ -96,7 +96,7 @@ def defineInputsMenu():
"fpga" : 0,
"legacy" : False,
"thresholds" : [
'jJ12', 'jJ12p0ETA23', 'jJ15', 'jJ15p0ETA25', 'jJ20', 'jJ25', 'jJ25p0ETA23', 'jJ30',
'jJ12', 'jJ12p0ETA25', 'jJ15', 'jJ15p0ETA25', 'jJ20', 'jJ25', 'jJ25p0ETA23', 'jJ30',
'jJ35p0ETA23', 'jJ40p0ETA25', 'jJ40', 'jJ50', 'jJ85', 'jJ100', 'jJ15p31ETA49',
'jJ20p31ETA49', 'jJ75p31ETA49'
]
......
......@@ -72,7 +72,7 @@ def defineLegacyInputsMenu():
"type" : "ctpin",
"legacy" : True,
"thresholds" : [
'J12', 'J12p0ETA23', 'J15', 'J15p0ETA25','J20', 'J25','J25p0ETA23','J30', # 8 x JETs and central jets
'J12', 'J12p0ETA25', 'J15', 'J15p0ETA25','J20', 'J25','J25p0ETA23','J30', # 8 x JETs and central jets
'J12p0ETA28', 'J20p0ETA49', # 2 x VBF
]
},
......
......@@ -59,7 +59,7 @@ def defineMenu():
# 10 x 3-bit JET (can have multiplicity 4 or more)
# 8 x JETs and central jets
'J12', 'J12p0ETA23', 'J15', 'J15p0ETA25','J20', 'J25','J25p0ETA23','J30',
'J12', 'J12p0ETA25', 'J15', 'J15p0ETA25','J20', 'J25','J25p0ETA23','J30',
# 2 x Central Jets
'J12p0ETA28', #'J12p0ETA25',
......@@ -350,7 +350,7 @@ def defineMenu():
# combined tau - jet
"L1_TAU20IM_2TAU12IM_J25_2J20_3J12",
"L1_TAU20IM_2TAU12IM_4J12p0ETA23",
"L1_TAU20IM_2TAU12IM_4J12p0ETA25",
"L1_TAU20IM_2TAU12IM_4J12p0ETA28",
"L1_TAU25IM_2TAU20IM_2J25_3J20",
......@@ -772,7 +772,7 @@ def defineMenu():
'L1_MU11_TAU20IM' : 430,
'L1_MU10_TAU20IM_J25_2J20' : 377,
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12' : 70,
'L1_TAU20IM_2TAU12IM_4J12p0ETA23' : 316,
'L1_TAU20IM_2TAU12IM_4J12p0ETA25' : 316,
#'L1_TAU20IM_2TAU12IM_4J12.0ETA25' : 73,
'L1_TAU20IM_2TAU12IM_4J12p0ETA28' : 77,
'L1_TAU25IM_2TAU20IM_2J25_3J20' : 398,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment