Commit 1785182f authored by Ligang Xia's avatar Ligang Xia
Browse files

add new L1Calo items to v8 (ATR-19437)

parent 14382193
......@@ -86,6 +86,15 @@ class Cabling:
from TriggerMenu.l1.Lvl1Flags import Lvl1Flags
run1 = Lvl1Flags.CTPVersion()<=3
if thrtype == 'EM' and mapping >= 16:
mapping = 15
elif thrtype == 'TAU' and mapping >= 16:
mapping = 15
elif thrtype == 'JET' and mapping >= 25:
mapping = 24
elif thrtype == 'XE' and mapping >=16:
mapping = 15
if run1:
type2cablename = { 'MUON' : [(0,6,'MUCTPI')],
......@@ -199,6 +208,17 @@ class InputCable:
else:
self.thrtype = threshold.ttype
self.mapping = int(threshold.mapping)
thrtype = self.thrtype
mapping = self.mapping
if thrtype == 'EM' and mapping >= 16:
mapping = 15
elif thrtype == 'TAU' and mapping >= 16:
mapping = 15
elif thrtype == 'JET' and mapping >= 25:
mapping = 24
elif thrtype == 'XE' and mapping >=16:
mapping = 15
self.mapping = mapping
self.isDirectIn = False # True for TOPO and ALFA which go into CTPCore
self.slot = None # input cable slot, possible values 7..9
......
......@@ -89,6 +89,7 @@ class ItemDef:
if not '_v6' in TriggerFlags.triggerMenuSetup() and not '_HI' in TriggerFlags.triggerMenuSetup():
LVL1MenuItem('L1_EM15VHI' ).setLogic( EM15VHI & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_EM22VH' ).setLogic( EM22VH & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_eEM22' ).setLogic( eEM22 & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_EM24VHIM' ).setLogic( EM24VHIM & physcond).setTriggerType( TT.calo ) # noqa: F821
else:
LVL1MenuItem('L1_EM15HI' ).setLogic( EM15HI & physcond).setTriggerType( TT.calo ) # noqa: F821
......@@ -375,6 +376,7 @@ class ItemDef:
#LVL1MenuItem('L1_TAU10IM').setLogic( HA10IM & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_TAU12' ).setLogic( HA12 & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_eTAU12' ).setLogic( eTAU12 & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_TAU12IL').setLogic( HA12IL & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_TAU12IM').setLogic( HA12IM & physcond).setTriggerType( TT.calo ) # noqa: F821
......@@ -561,6 +563,8 @@ class ItemDef:
LVL1MenuItem('L1_J175' ).setLogic( J175 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_J250' ).setLogic( J250 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_J400' ).setLogic( J400 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_jJ100' ).setLogic( jJ100 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_J10.31ETA49').setLogic( J1031ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
#LVL1MenuItem('L1_J20.31ETA49').setLogic( J2031ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
......@@ -718,6 +722,9 @@ class ItemDef:
LVL1MenuItem('L1_XE60').setLogic( XE60 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_XE70').setLogic( XE70 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_XE80').setLogic( XE80 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_gXERHO50').setLogic( gXERHO50 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_gXEPUFIT50').setLogic( gXEPUFIT50 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_XE10').setLogic( XE10 & physcond).setTriggerType(TT.calo) # noqa: F821
......
......@@ -57,7 +57,8 @@ def defineMenu():
'EM8I',
'EM10VH', 'EM12', 'EM15', 'EM15VH',
'EM15VHI',
'EM18VHI', 'EM20VH', 'EM20VHI', 'EM22VH', 'EM22VHI', 'EM24VHI', 'EM24VHIM',
'EM18VHI', 'EM20VH', 'EM20VHI', 'EM22VH', 'EM22VHI', 'EM24VHI', 'EM24VHIM',
'eEM22',
# 1 x ZB/
'ZB_EM15',
......@@ -67,7 +68,8 @@ def defineMenu():
#--------------------------
# 16 x TAU
'HA5', 'HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA25', 'HA25IM', 'HA30', 'HA40', 'HA60', 'HA100',
'HA5', 'HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA25', 'HA25IM', 'HA30', 'HA40', 'HA60', 'HA100',
'eTAU12',
#----------------------
# SLOT 8 / CON 0 (JET1)
......@@ -95,6 +97,7 @@ def defineMenu():
# 6 x FJ
'J15.31ETA49', 'J20.31ETA49', 'J30.31ETA49', 'J50.31ETA49', 'J75.31ETA49', #'JJ15.23ETA49', 'J100.31ETA49',
'jJ100',
#---------------------
# SLOT 8 / CON 2 (EN1)
......@@ -115,7 +118,8 @@ def defineMenu():
'XE10', 'XE20', 'XE25', 'XE30', 'XE35', 'XE40', 'XE45', 'XE50',
'XE55', 'XE60', 'XE65', 'XE70', 'XE75', 'XE80', 'XE150', 'XE300',
'gXERHO50', 'gXEPUFIT50',
# 8 x XS
'XS20', 'XS30', 'XS40', 'XS45', 'XS50', 'XS55', 'XS60', 'XS65',
......@@ -391,6 +395,7 @@ def defineMenu():
'L1_EM20VH_FIRSTEMPTY',
'L1_EM22VHI_FIRSTEMPTY',
#'L1_EM15_BGRP7',
'L1_eEM22',
# see savannah https://savannah.cern.ch/bugs/?103935
......@@ -419,9 +424,10 @@ def defineMenu():
"L1_TAU5", "L1_TAU12", "L1_TAU12IM", "L1_TAU20", "L1_TAU20IM",
"L1_TAU30","L1_TAU30_EMPTY","L1_TAU30_UNPAIRED_ISO", "L1_TAU40", "L1_TAU60", "L1_TAU100", "L1_TAU8", "L1_TAU8_EMPTY",
"L1_TAU8_UNPAIRED_ISO","L1_TAU8_FIRSTEMPTY","L1_TAU8_UNPAIRED_NONISO",
"L1_eTAU12",
# multi tau
"L1_TAU20IM_2TAU12IM", "L1_TAU20_2TAU12", "L1_TAU40_2TAU20IM", "L1_TAU60_2TAU40", "L1_2TAU5", "L1_2TAU8",
"L1_TAU20IM_2TAU12IM", "L1_TAU20_2TAU12", "L1_TAU40_2TAU20IM", "L1_TAU60_2TAU40", # "L1_2TAU5", "L1_2TAU8",
# combined tau - lepton
"L1_EM15VHI_2TAU12IM",
......@@ -489,7 +495,8 @@ def defineMenu():
'L1_MU20_XE30',
# single jet
"L1_J12","L1_J15","L1_J20","L1_J25", "L1_J30", "L1_J40", "L1_J50" ,"L1_J75","L1_J85", "L1_J100", "L1_J120", #"L1_J400",
"L1_J12", "L1_J15","L1_J20","L1_J25", "L1_J30", "L1_J40", "L1_J50" ,"L1_J75","L1_J85", "L1_J100", "L1_J120", #"L1_J400",
"L1_jJ100",
"L1_J20.31ETA49", "L1_J30.31ETA49", "L1_J50.31ETA49", "L1_J75.31ETA49", #"L1_J100.31ETA49",
#'L1_J15.23ETA49',
'L1_J15.31ETA49',
......@@ -543,6 +550,7 @@ def defineMenu():
"L1_XE35", "L1_XE40", "L1_XE45", "L1_XE50",
"L1_XE55", "L1_XE60", "L1_XE70", "L1_XE80",
'L1_XE10', 'L1_XE30', 'L1_XE300',
'L1_gXERHO50', 'L1_gXEPUFIT50',
#XS
'L1_EM12_XS20', 'L1_EM15_XS30',
......@@ -928,6 +936,7 @@ def defineMenu():
'L1_EM18VHI' : 8,
'L1_EM20VH' : 9,
'L1_EM20VHI' : 10,
'L1_eEM22' : 376,
'L1_EM22VHI' : 11,
'L1_EM22VH' : 295,
'L1_EM3_EMPTY' : 12,
......@@ -992,8 +1001,9 @@ def defineMenu():
'L1_TAU8' : 56,
'L1_TAU8_EMPTY' : 57,
'L1_TAU20IM_2TAU12IM' : 58,
'L1_2TAU5' : 365,
'L1_2TAU8' : 370,
'L1_eTAU12' : 365,
#'L1_2TAU5' : 365,
#'L1_2TAU8' : 370,
'L1_TAU20_2TAU12' : 59,
'L1_EM15VHI_2TAU12IM' : 60,
'L1_EM15VHI_2TAU12IM_J25_3J12' : 61,
......@@ -1104,6 +1114,8 @@ def defineMenu():
#'L1_XE25': 82,
'L1_XE30': 85,
'L1_XE300': 187,
'L1_gXERHO50' : 395,
'L1_gXEPUFIT50' : 396,
'L1_XE35' : 144,
'L1_XE40' : 145,
......@@ -1428,6 +1440,7 @@ def defineMenu():
'L1_MU6_J30.0ETA49_2J20.0ETA49' : 382,
'L1_4J20.0ETA49' : 383,
'L1_HT150-JJ15.ETA49_MJJ-400' : 416,
'L1_jJ100' : 370,
### ATR-15062
'L1_EM18VHI_MJJ-300' : 385,
......
......@@ -30,6 +30,9 @@ class ThresholdDef:
for thrV in [3, 4, 5, 6, 7, 8, 10, 12, 14, 15, 16, 18, 20, 22, 30, 50]:
tc.registerThr('EM%i' % thrV, 'EM').addThrValue(thrV)
for thrV in [22]:
tc.registerThr('eEM%i' % thrV, 'EM').addThrValue(thrV)
# for beam splashes:
#ThresholdValue.setDefaults('EM', {'etamin' : 16,'etamax' : 20, 'phimin' : 0,'phimax' : 64, 'isobits' : '00000', 'use_relIso' : True })
......@@ -235,6 +238,9 @@ class ThresholdDef:
for thrV in [1, 2, 3, 5, 6, 8, 12, 15, 20, 25, 30, 35, 40, 50, 60,100]:
tc.registerThr('HA%i' % thrV, 'TAU').addThrValue(thrV)
for thrV in [12]:
tc.registerThr('eTAU%i' % thrV, 'TAU').addThrValue(thrV)
# beam splashes
for thrV in [20]:
tc.registerThr('HA%iA' % thrV, 'TAU').addThrValue(255, priority=1).addThrValue( thrV, etamin = 12, etamax = 16, priority=2)
......@@ -283,6 +289,9 @@ class ThresholdDef:
for thrV in [5, 10, 12, 15, 20, 25, 30, 35, 40, 50, 60, 70, 75, 85, 100, 120, 150,175, 250, 400]:
tc.registerThr('J%i' % thrV, 'JET').addThrValue(JetOff).addThrValue(thrV, etamin=-31, etamax=31, priority=1) # jets are between -31 and 31 -ATR-11526
for thrV in [100]:
tc.registerThr('jJ%i' % thrV, 'JET').addThrValue(JetOff).addThrValue(thrV, etamin=-31, etamax=31, priority=1) # jets are between -31 and 31 -ATR-11526
ThresholdValue.setDefaults('JET', {})
......@@ -346,6 +355,12 @@ class ThresholdDef:
for thrV in [10, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 150, 300]:
tc.registerThr('XE%i' % thrV, 'XE').addThrValue(thrV)
for thrV in [50]:
tc.registerThr('gXERHO%i' % thrV, 'XE').addThrValue(thrV)
for thrV in [50]:
tc.registerThr('gXEPUFIT%i' % thrV, 'XE').addThrValue(thrV)
# XS
for thrV in [20, 25, 30, 35, 40, 45, 50, 55, 60, 65]:
tc.registerThr('XS%i' % thrV, 'XS').addThrValue(thrV)
......
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