diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index accecd09b2630cc7a273478bec61baa466df9193..8b43dbc3d0fd19b0eaaffe9ad0202669c81bdbda 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -1559,14 +1559,14 @@ class ItemDef:
# HT
#MenuItem('L1_HT0-J0.ETA49' ).setLogic( d.TOPO_HT0_AJ0allETA49 & physcond)
- MenuItem('L1_HT190-J15.ETA21' ).setLogic( d.R2TOPO_HT190_AJ15allETA21 & physcond)
- MenuItem('L1_HT190-J15s5.ETA21').setLogic( d.TOPO_HT190_J15s5ETA21 & physcond)
- MenuItem('L1_HT150-J20.ETA31' ).setLogic( d.R2TOPO_HT150_AJ20allETA31 & physcond)
- MenuItem('L1_HT150-J20s5.ETA31').setLogic( d.TOPO_HT150_J20s5ETA31 & physcond)
+ MenuItem('L1_HT190-J15.ETA21' ).setLogic( d.R2TOPO_HT190_AJ15allpETA21 & physcond)
+ MenuItem('L1_HT190-J15s5.ETA21').setLogic( d.TOPO_HT190_J15s5pETA21 & physcond)
+ MenuItem('L1_HT150-J20.ETA31' ).setLogic( d.R2TOPO_HT150_AJ20allpETA31 & physcond)
+ MenuItem('L1_HT150-J20s5.ETA31').setLogic( d.TOPO_HT150_J20s5pETA31 & physcond)
- MenuItem('L1_HT150-J20s5.ETA31_MJJ-400').setLogic( d.R2TOPO_HT150_J20s5ETA31 & d.R2TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
- MenuItem('L1_HT150-J20s5.ETA31_MJJ-400-CF').setLogic( d.TOPO_HT150_J20s5ETA31 & d.TOPO_400INVM9999_AJ30s6ETA31_AJ20s631ETA49 & physcond)
+ MenuItem('L1_HT150-J20s5.ETA31_MJJ-400').setLogic( d.R2TOPO_HT150_J20s5pETA31 & d.R2TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+ MenuItem('L1_HT150-J20s5.ETA31_MJJ-400-CF').setLogic( d.TOPO_HT150_J20s5pETA31 & d.TOPO_400INVM9999_AJ30s6pETA31_AJ20s6p31ETA49 & physcond)
# Jpsi T&P
MenuItem("L1_JPSI-1M5" ).setLogic( d.R2TOPO_1INVM5_EMs1_EMs6 & physcond)
MenuItem("L1_JPSI-1M5-EM7" ).setLogic( d.TOPO_1INVM5_EM7s1_EMs6 & physcond)
@@ -1580,10 +1580,10 @@ class ItemDef:
#MenuItem("L1_W-15DPHI-EM15XE-1").setLogic( d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
#MenuItem("L1_W-15DPHI-EMXE-1" ).setLogic( d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
- MenuItem("L1_W-05RO-XEHT-0" ).setLogic( d.R2TOPO_05RATIO_XE0_HT0_AJj15allETA49 & physcond)
- MenuItem("L1_W-90RO2-XEHT-0" ).setLogic( d.R2TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & physcond)
- MenuItem("L1_W-250RO2-XEHT-0" ).setLogic( d.R2TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & physcond)
- MenuItem("L1_W-HT20-JJ15.ETA49").setLogic( d.R2TOPO_HT20_AJj15allETA49 & physcond)
+ MenuItem("L1_W-05RO-XEHT-0" ).setLogic( d.R2TOPO_05RATIO_XE0_HT0_AJj15allpETA49 & physcond)
+ MenuItem("L1_W-90RO2-XEHT-0" ).setLogic( d.R2TOPO_90RATIO2_XE0_HT0_AJj15allpETA49 & physcond)
+ MenuItem("L1_W-250RO2-XEHT-0" ).setLogic( d.R2TOPO_250RATIO2_XE0_HT0_AJj15allpETA49 & physcond)
+ MenuItem("L1_W-HT20-JJ15.ETA49").setLogic( d.R2TOPO_HT20_AJj15allpETA49 & physcond)
#MenuItem("L1_W-NOMATCH").setLogic( d.TOPO_NOT_02MATCH_EM10s1_AJj15allETA49 & physcond)
@@ -1684,11 +1684,11 @@ class ItemDef:
MenuItem('L1_DPHI-2EM3_VTE10').setLogic( d.TOPO_27DPHI32_EMs1_EMs6 & Not(d.TE10) & physcond).setTriggerType(TT.calo)
MenuItem('L1_DPHI-2EM7_VTE50').setLogic( d.EM7.x(2) & d.TOPO_27DPHI32_EMs1_EMs6 & Not(d.TE50) & physcond).setTriggerType(TT.calo)
- MenuItem('L1_HT150-JJ15.ETA49').setLogic( d.R2TOPO_HT150_AJj15allETA49 & physcond)
- MenuItem('L1_HT150-JJ15.ETA49_MJJ-400').setLogic( d.R2TOPO_HT150_AJj15allETA49 & d.R2TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+ MenuItem('L1_HT150-JJ15.ETA49').setLogic( d.R2TOPO_HT150_AJj15allpETA49 & physcond)
+ MenuItem('L1_HT150-JJ15.ETA49_MJJ-400').setLogic( d.R2TOPO_HT150_AJj15allpETA49 & d.R2TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
- MenuItem('L1_J4-MATCH').setLogic( d.R2TOPO_0MATCH_4AJ20ETA31_4AJj15ETA31 & physcond)
+ MenuItem('L1_J4-MATCH').setLogic( d.R2TOPO_0MATCH_4AJ20pETA31_4AJj15pETA31 & physcond)
MenuItem('L1_LLP-RO').setLogic( d.TOPO_100RATIO_0MATCH_TAU30si2_EMall & physcond)
@@ -1703,7 +1703,7 @@ class ItemDef:
MenuItem('L1_DR25-TAU20ITAU12I').setLogic( d.TOPO_0DR25_TAU20abi_TAU12abi & physcond)
MenuItem('L1_30M-EM20ITAU12').setLogic( d.TOPO_DISAMB_30INVM_EM20his2_TAU12ab & physcond)
- MenuItem('L1_MJJ-400-CF').setLogic( d.TOPO_400INVM9999_AJ30s6ETA31_AJ20s631ETA49 & physcond)
+ MenuItem('L1_MJJ-400-CF').setLogic( d.TOPO_400INVM9999_AJ30s6pETA31_AJ20s6p31ETA49 & physcond)
MenuItem('L1_DR-TAU20ITAU12I').setLogic( d.TOPO_0DR28_TAU20abi_TAU12abi & physcond)
MenuItem('L1_BOX-TAU20ITAU12I').setLogic( d.R2TOPO_0DETA20_0DPHI20_TAU20abi_TAU12abi & physcond)
@@ -1774,14 +1774,14 @@ class ItemDef:
MenuItem('L1_LATE-MU10_XE40').setLogic( d.TOPO_LATE_MU10s1 & d.XE40 & physcond)
MenuItem('L1_LATE-MU10_J50').setLogic( d.TOPO_LATE_MU10s1 & d.J50 & physcond)
- MenuItem('L1_SC111-CJ15').setLogic( d.TOPO_SC111_CJ15abETA26 & physcond)
- MenuItem('L1_SC85-CJ15').setLogic( d.R2TOPO_SC85_CJ15abETA26 & physcond)
+ MenuItem('L1_SC111-CJ15').setLogic( d.TOPO_SC111_CJ15abpETA26 & physcond)
+ MenuItem('L1_SC85-CJ15').setLogic( d.R2TOPO_SC85_CJ15abpETA26 & physcond)
MenuItem('L1_TAU60_DR-TAU20ITAU12I' ).setLogic( d.HA60 & d.TOPO_0DR28_TAU20abi_TAU12abi & physcond)
MenuItem('L1_CEP-CJ60').setLogic( d.TOPO_CEP_CJ60s6 & physcond )
MenuItem('L1_CEP-CJ50').setLogic( d.TOPO_CEP_CJ50s6 & physcond )
- MenuItem('L1_CEP-CJ50.ETA21').setLogic( d.TOPO_CEP_CJ50s6ETA21 & physcond )
+ MenuItem('L1_CEP-CJ50.ETA21').setLogic( d.TOPO_CEP_CJ50s6pETA21 & physcond )
except NameError as ex:
exc_type, exc_value, exc_traceback = sys.exc_info()
@@ -1804,7 +1804,7 @@ class ItemDef:
except Exception as ex:
- log.error( "Creation of L1Topo item failed, will abort! Exception is a %s: '%s'" , type(ex), ex)
+ log.error( "Creation of L1Topo item failed, will abort!: %s" , ex)
raise
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index b5529c93639072cf445f622dda65dad1a7d1b803..136c89817634967d7830c53811f3099d4b1930e5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -595,17 +595,17 @@ class TopoAlgoDef:
# (ATR-8194) L1Topo HT Trigger
if usev8:
algoList = [
- {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5.ETA31
- {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5.ETA21
+ {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5pETA31
+ {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5pETA21
]
else:
algoList = [
- {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5.ETA31
- {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5.ETA21
- {"minHT": 190, "otype" : "AJ", "ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 21}, #HT190-AJ15all.ETA21
- {"minHT": 150, "otype" : "AJ", "ocut" : 20, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 31}, #HT150-AJ20all.ETA31
- {"minHT": 150, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT150-AJj15all.ETA49
- {"minHT": 20, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT20-AJj15all.ETA49
+ {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5pETA31
+ {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5pETA21
+ {"minHT": 190, "otype" : "AJ", "ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 21}, #HT190-AJ15allpETA21
+ {"minHT": 150, "otype" : "AJ", "ocut" : 20, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 31}, #HT150-AJ20allpETA31
+ {"minHT": 150, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT150-AJj15allpETA49
+ {"minHT": 20, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT20-AJj15allpETA49
]
for x in algoList:
@@ -614,7 +614,7 @@ class TopoAlgoDef:
for k in x:
setattr (d, k, x[k])
- toponame = "HT%d-%s%s%s%s.ETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
+ toponame = "HT%d-%s%s%s%spETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
log.debug("Define %s", toponame)
@@ -1097,7 +1097,7 @@ class TopoAlgoDef:
# JetMatch
if not usev8:
- toponame = "0MATCH-4AJ20.ETA31-4AJj15.ETA31"
+ toponame = "0MATCH-4AJ20pETA31-4AJj15pETA31"
alg = AlgConf.MultiplicityCustom( name = toponame, inputs = [ 'AJMatchall' ], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('NumResultBits', 1)
@@ -1109,7 +1109,7 @@ class TopoAlgoDef:
# NoMatch for W T&P
if not usev8:
- toponame = "NOT-02MATCH-EM10s1-AJj15all.ETA49"
+ toponame = "NOT-02MATCH-EM10s1-AJj15allpETA49"
alg = AlgConf.NotMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.InputWidthJET)
@@ -1126,7 +1126,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
# RATIO SUM for W T&P
- #toponame = "05RATIO-XE0-SUM0-EM10s1-HT0-AJj15all.ETA49"
+ #toponame = "05RATIO-XE0-SUM0-EM10s1-HT0-AJj15allpETA49"
#alg = AlgConf.RatioSum( name = toponame, inputs = ['XE', 'AJjall', 'EMs'], outputs = [ toponame ], algoId = -1 );
#alg.addgeneric('InputWidth1', 1)
#alg.addgeneric('InputWidth2', HW.InputWidthJET)
@@ -1165,7 +1165,7 @@ class TopoAlgoDef:
for k in x:
setattr (d, k, x[k])
- toponame = "%02d%s-XE0-HT0-AJj%sall.ETA49" % (d.minRatio, d.Ratio, str(d.ocut))
+ toponame = "%02d%s-XE0-HT0-AJj%sallpETA49" % (d.minRatio, d.Ratio, str(d.ocut))
log.debug("Define %s", toponame)
alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = -1 )
@@ -1553,12 +1553,12 @@ class TopoAlgoDef:
# (ATR-12748) fat jet trigger with Simple Cone algo
if not usev8:
algoList = [
- {"minHT": 111, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC111-CJ15ab.ETA26
- {"minHT": 85, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC85-CJ15ab.ETA26
+ {"minHT": 111, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC111-CJ15abpETA26
+ {"minHT": 85, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC85-CJ15abpETA26
]
if usev8:
algoList = [
- {"minHT": 111, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC111-CJ15ab.ETA26
+ {"minHT": 111, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC111-CJ15abpETA26
]
for x in algoList:
@@ -1567,7 +1567,7 @@ class TopoAlgoDef:
for k in x:
setattr (d, k, x[k])
- toponame = "SC%d-%s%s%s%s.ETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
+ toponame = "SC%d-%s%s%s%spETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
log.debug("Define %s", toponame)
@@ -1616,7 +1616,9 @@ class TopoAlgoDef:
for x in [
- { "minInvm": 400, "maxInvm": 9999, "otype1" : "AJ", "ocut1": 30, "olist1" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "otype2" : "AJ", "ocut2": 20, "olist2" : "s", "nleading2" : 6, "inputwidth2": HW.OutputWidthSortJET, "applyEtaCut":1, "minEta1": 0 ,"maxEta1": 31 , "minEta2": 31 ,"maxEta2": 49 , }, #400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49
+ { "minInvm": 400, "maxInvm": 9999, "otype1" : "AJ", "ocut1": 30, "olist1" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET,
+ "otype2" : "AJ", "ocut2": 20, "olist2" : "s", "nleading2" : 6, "inputwidth2": HW.OutputWidthSortJET, "applyEtaCut":1,
+ "minEta1": 0 ,"maxEta1": 31 , "minEta2": 31 ,"maxEta2": 49 , }, #400INVM9999-AJ30s6pETA31-AJ20s6p31ETA49
]:
class d:
@@ -1624,8 +1626,8 @@ class TopoAlgoDef:
for k in x:
setattr (d, k, x[k])
- obj1 = "%s%s%s.%sETA%i" % (d.otype1, str(d.ocut1), d.olist1 + (str(d.nleading1) if d.olist1.find('s')>=0 else ""),str(d.minEta1) if d.minEta1>0 else "", d.maxEta1)
- obj2 = "-%s%s%s.%sETA%i" % (d.otype2, str(d.ocut2), d.olist2 + (str(d.nleading2) if d.olist2.find('s')>=0 else ""),str(d.minEta2) if d.minEta2>0 else "", d.maxEta2)
+ obj1 = "%s%s%sp%sETA%i" % (d.otype1, str(d.ocut1), d.olist1 + (str(d.nleading1) if d.olist1.find('s')>=0 else ""),str(d.minEta1) if d.minEta1>0 else "", d.maxEta1)
+ obj2 = "-%s%s%sp%sETA%i" % (d.otype2, str(d.ocut2), d.olist2 + (str(d.nleading2) if d.olist2.find('s')>=0 else ""),str(d.minEta2) if d.minEta2>0 else "", d.maxEta2)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
@@ -2146,7 +2148,7 @@ class TopoAlgoDef:
if usev8:
x = 50
- toponame = "CEP-CJ%is6ETA21" % x
+ toponame = "CEP-CJ%is6pETA21" % x
log.debug("Define %s", toponame)
inputList = ['CJsETA21']
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
index a2c5b910aaf98259fe0675776744e30bdd84dca6..49e457075c1da3ca6e3bece6222b9924afefb4ba 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
@@ -630,17 +630,17 @@ class TopoAlgoDefLegacy:
# (ATR-8194) L1Topo HT Trigger
if usev8:
algoList = [
- {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5.ETA31
- {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5.ETA21
+ {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5pETA31
+ {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5pETA21
]
else:
algoList = [
- {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5.ETA31
- {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5.ETA21
- {"minHT": 190, "otype" : "AJ", "ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 21}, #HT190-AJ15all.ETA21
- {"minHT": 150, "otype" : "AJ", "ocut" : 20, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 31}, #HT150-AJ20all.ETA31
- {"minHT": 150, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT150-AJj15all.ETA49
- {"minHT": 20, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT20-AJj15all.ETA49
+ {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5pETA31
+ {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5pETA21
+ {"minHT": 190, "otype" : "AJ", "ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 21}, #HT190-AJ15allpETA21
+ {"minHT": 150, "otype" : "AJ", "ocut" : 20, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 31}, #HT150-AJ20allpETA31
+ {"minHT": 150, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT150-AJj15allpETA49
+ {"minHT": 20, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49}, #HT20-AJj15allpETA49
]
for x in algoList:
@@ -649,7 +649,7 @@ class TopoAlgoDefLegacy:
for k in x:
setattr (d, k, x[k])
- toponame = "HT%d-%s%s%s%s.ETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
+ toponame = "HT%d-%s%s%s%spETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
log.debug("Define %s", toponame)
@@ -1145,7 +1145,7 @@ class TopoAlgoDefLegacy:
# JetMatch
if not usev8:
- toponame = "0MATCH-4AJ20.ETA31-4AJj15.ETA31"
+ toponame = "0MATCH-4AJ20pETA31-4AJj15pETA31"
alg = AlgConf.MultiplicityCustom( name = toponame, inputs = [ 'AJMatchall' ], outputs = [ toponame ], algoId = currentAlgoId )
currentAlgoId += 1
alg.addgeneric('InputWidth', HW.InputWidthJET)
@@ -1158,7 +1158,7 @@ class TopoAlgoDefLegacy:
# NoMatch for W T&P
if not usev8:
- toponame = "NOT-02MATCH-EM10s1-AJj15all.ETA49"
+ toponame = "NOT-02MATCH-EM10s1-AJj15allpETA49"
alg = AlgConf.NotMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId )
currentAlgoId += 1
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
@@ -1215,7 +1215,7 @@ class TopoAlgoDefLegacy:
for k in x:
setattr (d, k, x[k])
- toponame = "%02d%s-XE0-HT0-AJj%sall.ETA49" % (d.minRatio, d.Ratio, str(d.ocut))
+ toponame = "%02d%s-XE0-HT0-AJj%sallpETA49" % (d.minRatio, d.Ratio, str(d.ocut))
log.debug("Define %s", toponame)
alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId )
@@ -1653,7 +1653,7 @@ class TopoAlgoDefLegacy:
for k in x:
setattr (d, k, x[k])
- toponame = "SC%d-%s%s%s%s.ETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
+ toponame = "SC%d-%s%s%s%spETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
log.debug("Define %s", toponame)
@@ -1705,7 +1705,7 @@ class TopoAlgoDefLegacy:
for x in [
- { "minInvm": 400, "maxInvm": 9999, "otype1" : "AJ", "ocut1": 30, "olist1" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "otype2" : "AJ", "ocut2": 20, "olist2" : "s", "nleading2" : 6, "inputwidth2": HW.OutputWidthSortJET, "applyEtaCut":1, "minEta1": 0 ,"maxEta1": 31 , "minEta2": 31 ,"maxEta2": 49 , }, #400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49
+ { "minInvm": 400, "maxInvm": 9999, "otype1" : "AJ", "ocut1": 30, "olist1" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "otype2" : "AJ", "ocut2": 20, "olist2" : "s", "nleading2" : 6, "inputwidth2": HW.OutputWidthSortJET, "applyEtaCut":1, "minEta1": 0 ,"maxEta1": 31 , "minEta2": 31 ,"maxEta2": 49 , }, #400INVM9999-AJ30s6.ETA31-AJ20s6p31ETA49
]:
class d:
@@ -1713,8 +1713,8 @@ class TopoAlgoDefLegacy:
for k in x:
setattr (d, k, x[k])
- obj1 = "%s%s%s.%sETA%i" % (d.otype1, str(d.ocut1), d.olist1 + (str(d.nleading1) if d.olist1.find('s')>=0 else ""),str(d.minEta1) if d.minEta1>0 else "", d.maxEta1)
- obj2 = "-%s%s%s.%sETA%i" % (d.otype2, str(d.ocut2), d.olist2 + (str(d.nleading2) if d.olist2.find('s')>=0 else ""),str(d.minEta2) if d.minEta2>0 else "", d.maxEta2)
+ obj1 = "%s%s%sp%sETA%i" % (d.otype1, str(d.ocut1), d.olist1 + (str(d.nleading1) if d.olist1.find('s')>=0 else ""),str(d.minEta1) if d.minEta1>0 else "", d.maxEta1)
+ obj2 = "-%s%s%sp%sETA%i" % (d.otype2, str(d.ocut2), d.olist2 + (str(d.nleading2) if d.olist2.find('s')>=0 else ""),str(d.minEta2) if d.minEta2>0 else "", d.maxEta2)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
index 565e6c24858d8fe995ea16b64f392305360746e1..ce5cc26854a54e58ae12a45cde9a532c5ade7a17 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
@@ -40,6 +40,7 @@ class L1MenuConfig(object):
self.menuFullName = L1MenuFlags.MenuSetup()
self.menuName = self._getMenuBaseName(self.menuFullName)
+ self.menuToLoad = self._menuToLoad()
self.inputFile = inputFile
self.l1menuFromFile = (self.inputFile is not None)
self.generated = False
@@ -95,7 +96,7 @@ class L1MenuConfig(object):
try:
return self._definedThresholds[name]
except KeyError:
- raise RuntimeError("Threshold %s is not defined" % name)
+ return None
def getDefinedThresholds(self):
return self._definedThresholds.values()
@@ -221,7 +222,7 @@ class L1MenuConfig(object):
log.warning("No menu was generated, can not create json file")
return None
- def menuToLoad(self,silent=False):
+ def _menuToLoad(self,silent=False):
""" resolve the menu name to the menu files to load"""
menuToLoadReq = self.menuName
from .Menu.MenuMapping import menuMap
@@ -234,9 +235,8 @@ class L1MenuConfig(object):
return menuToLoad
def _checkMenuExistence(self):
- menuToLoad = self.menuToLoad(silent=True)
from PyUtils.moduleExists import moduleExists
- modname = 'TriggerMenuMT.L1.Menu.Menu_%s' % menuToLoad
+ modname = 'TriggerMenuMT.L1.Menu.Menu_%s' % self.menuToLoad
if not moduleExists (modname):
log.warning("No L1 menu available for %s", self.menuName )
return False
@@ -252,14 +252,13 @@ class L1MenuConfig(object):
"""
# we apply a hack here. menu group is working on LS2_v1, until ready we will use MC_pp_v8
- menuToLoad = self.menuToLoad()
- log.info("Reading TriggerMenuMT.Menu.Menu_%s", menuToLoad)
- menumodule = __import__('TriggerMenuMT.L1.Menu.Menu_%s' % menuToLoad, globals(), locals(), ['defineMenu'], 0)
+ log.info("Reading TriggerMenuMT.Menu.Menu_%s", self.menuToLoad)
+ menumodule = __import__('TriggerMenuMT.L1.Menu.Menu_%s' % self.menuToLoad, globals(), locals(), ['defineMenu'], 0)
menumodule.defineMenu()
- log.info("... L1 menu '%s' contains:", menuToLoad)
+ log.info("... L1 menu '%s' contains:", self.menuToLoad)
- log.info("Reading TriggerMenuMT.Menu.Menu_%s_inputs", menuToLoad)
- topomenumodule = __import__('TriggerMenuMT.L1.Menu.Menu_%s_inputs' % menuToLoad, globals(), locals(), ['defineMenu'], 0)
+ log.info("Reading TriggerMenuMT.Menu.Menu_%s_inputs", self.menuToLoad)
+ topomenumodule = __import__('TriggerMenuMT.L1.Menu.Menu_%s_inputs' % self.menuToLoad, globals(), locals(), ['defineMenu'], 0)
topomenumodule.defineInputsMenu()
algoCount = 0
for boardName, boardDef in L1MenuFlags.boards().items():
@@ -270,13 +269,13 @@ class L1MenuConfig(object):
else:
for t in c["algorithmGroups"]:
algoCount += len(t["algorithms"])
- log.info("... L1Topo menu '%s' contains %i algorithms", menuToLoad, algoCount)
+ log.info("... L1Topo menu '%s' contains %i algorithms", self.menuToLoad, algoCount)
try:
- log.info("Reading TriggerMenuMT.Menu.Menu_%s_inputs_legacy", menuToLoad)
- legacymenumodule = __import__('TriggerMenuMT.L1.Menu.Menu_%s_inputs_legacy' % menuToLoad, globals(), locals(), ['defineMenu'], 0)
+ log.info("Reading TriggerMenuMT.Menu.Menu_%s_inputs_legacy", self.menuToLoad)
+ legacymenumodule = __import__('TriggerMenuMT.L1.Menu.Menu_%s_inputs_legacy' % self.menuToLoad, globals(), locals(), ['defineMenu'], 0)
legacymenumodule.defineLegacyInputsMenu()
- log.info("... L1 legacy menu %s contains %i legacy boards (%s)", menuToLoad, len(L1MenuFlags.legacyBoards()), ', '.join(L1MenuFlags.legacyBoards().keys()))
+ log.info("... L1 legacy menu %s contains %i legacy boards (%s)", self.menuToLoad, len(L1MenuFlags.legacyBoards()), ', '.join(L1MenuFlags.legacyBoards().keys()))
except ImportError:
log.info("==> No menu defining the legacy inputs was found, will assume this intended")
@@ -396,7 +395,14 @@ class L1MenuConfig(object):
for lineName in topodef.outputlines:
thrName = currentTopoCategory.prefix + lineName
thr = self.getDefinedThreshold(thrName) # threshold has to be defined
- self.l1menu.addThreshold( thr )
+ if thr is None:
+ msg = 'Threshold %s is required for board %s, connector %s (file L1/Menu/Menu_%s_inputs%s.py), but it is not registered. ' % (thrName, boardName, connDef['name'],
+ self.menuToLoad, '_legacy' if 'legacy' in boardDef else "" )
+ msg += 'Please add L1Topo alg with output %s to L1/Config/TopoAlgoDef%s.py.' % (thrName.split('_',1)[-1], 'Legacy' if 'legacy' in boardDef else "")
+ log.error(msg)
+ raise RuntimeError(msg)
+ else:
+ self.l1menu.addThreshold( thr )
log.info("Generating topo menu using %i topo algorithms with %i trigger lines", nAlgos, nLines )
#
@@ -489,7 +495,7 @@ class L1MenuConfig(object):
continue
threshold = self.getDefinedThreshold(thrName)
if threshold is None:
- log.error('Threshold %s is listed in menu but not defined', thrName )
+ log.error('Threshold %s is required in menu on board %s, connector %s, but it is not defined', (thrName, boardName, connDef['name']) )
list_of_undefined_thresholds += [ thrName ]
else:
self.l1menu.addThreshold( threshold )
@@ -555,7 +561,7 @@ class L1MenuConfig(object):
if thrName not in self.l1menu.thresholds:
isLegacyThr = any(filter(lambda x: thrName.startswith(x), ["R2TOPO_", "EM", "TAU", "J", "XE", "TE", "XS"]))
- msg = "L1 item {item} has been added to the menu L1/Menu/Menu_{menu}.py, but the required threshold {thr} is not listed as input in L1/Menu/Menu_{menu}_inputs{legacy}.py".format(item=itemName, thr=thrName, menu=self.menuToLoad(), legacy = "_legacy" if isLegacyThr else "")
+ msg = "L1 item {item} has been added to the menu L1/Menu/Menu_{menu}.py, but the required threshold {thr} is not listed as input in L1/Menu/Menu_{menu}_inputs{legacy}.py".format(item=itemName, thr=thrName, menu=self.menuToLoad, legacy = "_legacy" if isLegacyThr else "")
log.error(msg)
raise RuntimeError(msg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
index 2f2ec498cbd67785b442c950793806e44c58b8f5..71c27e2df737ce43a016970c819164bedd0c0686 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
@@ -138,16 +138,16 @@ def defineInputsMenu():
"fpga" : 0,
"clock" : 0,
"algorithms" : [
- TopoMenuDef( 'HT190-J15s5.ETA21', outputbits = 0 ),
+ TopoMenuDef( 'HT190-J15s5pETA21', outputbits = 0 ),
TopoMenuDef( '0DR03-EM7ab-CJ15ab', outputbits = 1 ),
TopoMenuDef( 'INVM_NFF', outputbits = 2, outputlines = ['500INVM9999-J30s6-AJ20s6'] ),
TopoMenuDef( 'INVM_AJ_HighMass', outputbits = 3, outputlines = ['700INVM9999-AJ30s6-AJ20s6'] ),
TopoMenuDef( 'INVM_AJ_LowMass', outputbits = 4, outputlines = ['300INVM9999-AJ30s6-AJ20s6'] ),
- TopoMenuDef( 'HT150-J20s5.ETA31', outputbits = 5 ),
- TopoMenuDef( '400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49', outputbits = 6 ),
+ TopoMenuDef( 'HT150-J20s5pETA31', outputbits = 5 ),
+ TopoMenuDef( '400INVM9999-AJ30s6pETA31-AJ20s6p31ETA49', outputbits = 6 ),
TopoMenuDef( '10MINDPHI-J20s2-XE30', outputbits = 7 ),
TopoMenuDef( '10MINDPHI-J20s2-XE50', outputbits = 8 ),
- TopoMenuDef( 'SC111-CJ15ab.ETA26', outputbits = 9 ),
+ TopoMenuDef( 'SC111-CJ15abpETA26', outputbits = 9 ),
TopoMenuDef( '0DETA20-J50s1-Js2', outputbits = 10 ),
TopoMenuDef( '1DISAMB-J25ab-0DR28-EM15his2-TAU12abi', outputbits = 11 ),
TopoMenuDef( '2DISAMB-J25ab-0DR28-TAU20abi-TAU12abi', outputbits = 12 ),
@@ -161,7 +161,7 @@ def defineInputsMenu():
"fpga" : 0,
"clock" : 1,
"algorithms" : [
- TopoMenuDef( 'CEP-CJ50s6ETA21', outputbits = 0 ),
+ TopoMenuDef( 'CEP-CJ50s6pETA21', outputbits = 0 ),
TopoMenuDef( 'CEP-CJ60s6', outputbits = 1 ),
TopoMenuDef( 'CEP-CJ50s6', outputbits = 2 ),
TopoMenuDef( '2DISAMB-J25ab-0DR25-TAU20abi-TAU12abi', outputbits = 3 ),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
index 8f9235ad985d3d244278236a1ec4b91fa0bbcda0..02d5b78e046254dbccb132ff5b661fda36694657 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
@@ -139,13 +139,13 @@ def defineLegacyInputsMenu():
"200INVM9999-AJ30s6-AJ20s6",
"100INVM9999-AJ30s6-AJ20s6" ] ),
TopoMenuDef( "0INVM9-EM7ab-EMab", outputbits = 8 ),
- TopoMenuDef( "HT150-J20s5.ETA31", outputbits = 9 ),
- TopoMenuDef( "HT190-J15s5.ETA21", outputbits = 10 ),
+ TopoMenuDef( "HT150-J20s5pETA31", outputbits = 9 ),
+ TopoMenuDef( "HT190-J15s5pETA21", outputbits = 10 ),
TopoMenuDef( "INVM_EMs6", outputbits = (11,13), outputlines = [ "1INVM5-EMs1-EMs6",
"1INVM5-EM7s1-EMs6",
"1INVM5-EM12s1-EMs6" ] ),
TopoMenuDef( "05MINDPHI-EM12s6-XE0", outputbits = 14 ),
- TopoMenuDef( "400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49", outputbits = 15 ),
+ TopoMenuDef( "400INVM9999-AJ30s6pETA31-AJ20s6p31ETA49", outputbits = 15 ),
]
},
{
@@ -163,7 +163,7 @@ def defineLegacyInputsMenu():
TopoMenuDef( "NOT-0MATCH-TAU30si1-EMall", outputbits = 8 ),
TopoMenuDef( "LAR-EM20shi1", outputbits = 9 ),
TopoMenuDef( "LAR-J100s1", outputbits = 10 ),
- TopoMenuDef( "NOT-02MATCH-EM10s1-AJj15all.ETA49", outputbits = 11 ),
+ TopoMenuDef( "NOT-02MATCH-EM10s1-AJj15allpETA49", outputbits = 11 ),
TopoMenuDef( "27DPHI32-EMs1-EMs6", outputbits = 12 ),
TopoMenuDef( "35MT-EM12s6-XE0", outputbits = 13 ),
TopoMenuDef( "15MINDPHI-EM12s6-XE0", outputbits = 14 ),
@@ -245,8 +245,8 @@ def defineLegacyInputsMenu():
TopoMenuDef( "0DPHI03-EM15abi-MUab", outputbits = 8 ),
TopoMenuDef( "10MINDPHI-AJ20s2-XE50", outputbits = 9 ),
TopoMenuDef( "LATE-MU10s1", outputbits = 10 ),
- TopoMenuDef( "SC111-CJ15ab.ETA26", outputbits = 11 ),
- TopoMenuDef( "SC85-CJ15ab.ETA26", outputbits = 12 ),
+ TopoMenuDef( "SC111-CJ15abpETA26", outputbits = 11 ),
+ TopoMenuDef( "SC85-CJ15abpETA26", outputbits = 12 ),
]
},
{
@@ -259,22 +259,22 @@ def defineLegacyInputsMenu():
"KF-XE60-AJall",
"KF-XE65-AJall",
"KF-XE75-AJall" ] ),
- TopoMenuDef( "0MATCH-4AJ20.ETA31-4AJj15.ETA31", outputbits = 6 ),
- TopoMenuDef( "HT190-AJ15all.ETA21", outputbits = 7 ),
- TopoMenuDef( "HT150-AJ20all.ETA31", outputbits = 8 ),
- TopoMenuDef( "HT150-AJj15all.ETA49", outputbits = 9 ),
- TopoMenuDef( "HT20-AJj15all.ETA49", outputbits = 10 ),
+ TopoMenuDef( "0MATCH-4AJ20pETA31-4AJj15pETA31", outputbits = 6 ),
+ TopoMenuDef( "HT190-AJ15allpETA21", outputbits = 7 ),
+ TopoMenuDef( "HT150-AJ20allpETA31", outputbits = 8 ),
+ TopoMenuDef( "HT150-AJj15allpETA49", outputbits = 9 ),
+ TopoMenuDef( "HT20-AJj15allpETA49", outputbits = 10 ),
TopoMenuDef( "0DETA20-J50s1-Js2", outputbits = 12 ),
- TopoMenuDef( "05RATIO-XE0-HT0-AJj15all.ETA49", outputbits = 13 ),
+ TopoMenuDef( "05RATIO-XE0-HT0-AJj15allpETA49", outputbits = 13 ),
TopoMenuDef( "63DETA127-FJ20s1-FJ20s2", outputbits = 14 ),
- TopoMenuDef( "90RATIO2-XE0-HT0-AJj15all.ETA49", outputbits = 15 )
+ TopoMenuDef( "90RATIO2-XE0-HT0-AJj15allpETA49", outputbits = 15 )
]
},
{
"fpga" : 1,
"clock" : 1,
"algorithms" : [
- TopoMenuDef( "250RATIO2-XE0-HT0-AJj15all.ETA49", outputbits = 0 ),
+ TopoMenuDef( "250RATIO2-XE0-HT0-AJj15allpETA49", outputbits = 0 ),
TopoMenuDef( "10MINDPHI-J20ab-XE50", outputbits = 1 ),
TopoMenuDef( "0DR28-TAU20abi-TAU12abi", outputbits = 2 ),
TopoMenuDef( "1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi", outputbits = 3 ),