diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
index c930765f16fa1fcdef74a0aa77739c43f1cc26fe..f8006e62585c7d0de46cd2cd08d31bfbafb1d21f 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
@@ -184,17 +184,17 @@ def generateL1DecoderAndChains():
# in symmetric chains, multiplicity=2 but only one sequence is used
CombChains =[
- makeChain(name='HLT_mu8_e8_L1MU6_EM7', L1Thresholds=["MU6","EM7"], ChainSteps=[ ChainStep("Step1_mu_em", [mu11, el11], multiplicity=2),
- ChainStep("Step2_mu_em", [mu21, el21], multiplicity=2)] ),
- makeChain(name='HLT_e5_e8_L1EM3_EM5', L1Thresholds=["EM3","EM5"], ChainSteps=[ ChainStep("Step1_2em", [el11, el11], multiplicity=2),
- ChainStep("Step2_2em", [el21, el21], multiplicity=2) ]),
- makeChain(name='HLT_2mu6_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu", [mu11], multiplicity=2),
- ChainStep("Step2_2mu", [mu21], multiplicity=2) ]),
- makeChain(name='HLT_2mu6Comb_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu_empty", multiplicity=2),
- ChainStep("Step2_2mu", [mu21], multiplicity=2) ]),
- makeChain(name='HLT_2mu4_bDimu_L12MU4', L1Thresholds=["MU4"], ChainSteps=[ ChainStep("Step1_2mu", [mu11], multiplicity=2),
+ makeChain(name='HLT_mu8_e8_L1MU6_EM7', L1Thresholds=["MU6","EM7"], ChainSteps=[ ChainStep("Step1_mu_em", [mu11, el11], multiplicity=[1,1]),
+ ChainStep("Step2_mu_em", [mu21, el21], multiplicity=[1,1])] ),
+ makeChain(name='HLT_e5_e8_L1EM3_EM5', L1Thresholds=["EM3","EM5"], ChainSteps=[ ChainStep("Step1_2em", [el11, el11], multiplicity=[1,1]),
+ ChainStep("Step2_2em", [el21, el21], multiplicity=[1,1]) ]),
+ makeChain(name='HLT_2mu6_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu", [mu11], multiplicity=[2]),
+ ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
+ makeChain(name='HLT_2mu6Comb_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu_empty", multiplicity=[2]),
+ ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
+ makeChain(name='HLT_2mu4_bDimu_L12MU4', L1Thresholds=["MU4"], ChainSteps=[ ChainStep("Step1_2mu", [mu11], multiplicity=[2]),
step_mu22,
- ChainStep("Step3_2mu", [mu31], multiplicity=2)] )
+ ChainStep("Step3_2mu", [mu31], multiplicity=[2])] )
]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 0c81b4b5a2d6c33f15ea0e09f7ea1539e8e9eff3..452691b9c27d9d7ee997cfab8b08f94ce91426ef 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -487,6 +487,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j85_L1J20 ID#510475538
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_j80_j60_L1J15 ID#582699527
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep1 19 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
@@ -497,6 +498,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_2e3_etcut_L12EM
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 19 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 ID#3634067472
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j35_gsc45_bmv2c1070_split_L1J20 ID#3815360851
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 ID#4034799151
TriggerSummaryStep1 19 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792
@@ -604,6 +606,10 @@ TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 decisions 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J2020 20 1 0 0 0 0 0 1
+TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 decisions 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 20 20 1 0 0 0 0 0 1
+TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 decisions 1 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 1 0 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 1 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 1 1 0 0 0 1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
index 489ae3e09e08ffd105558b60f81aa7eaf83765b7..2ff3b071ecefce84db4ad29541b0be9c98c2a479 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
@@ -102,20 +102,20 @@ if opt.doMuonSlice == True:
# multi muon trigger
# 2muons symmetric
- step1_2mufast_sym= ChainStep("Step1_2muFast_sym", [ muFastSequence()], multiplicity=2)
- step2_2muComb_sym= ChainStep("Step1_2muComb_sym", [ muCombSequence()], multiplicity=2)
+ step1_2mufast_sym= ChainStep("Step1_2muFast_sym", [ muFastSequence()], multiplicity=[2])
+ step2_2muComb_sym= ChainStep("Step1_2muComb_sym", [ muCombSequence()], multiplicity=[2])
- step3_2muEFSA_sym= ChainStep("Step3_2muEFSA_sym", [ muEFSASequence()], multiplicity=2)
- step4_2muEFCB_sym= ChainStep("Step4_2muEFCB_sym", [ muEFCBSequence()], multiplicity=2)
+ step3_2muEFSA_sym= ChainStep("Step3_2muEFSA_sym", [ muEFSASequence()], multiplicity=[2])
+ step4_2muEFCB_sym= ChainStep("Step4_2muEFCB_sym", [ muEFCBSequence()], multiplicity=[2])
MuonChains += [ makeChain(name='HLT_2mu6Comb_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ step1_2mufast_sym, step2_2muComb_sym ])]
# 2muons asymmetric (this will change): 2 sequences, 2 seeds
- step1_2mufast_asym= ChainStep("Step1_2muFast_asym", [ muFastSequence(), muFastSequence()], multiplicity=2)
- step2_2muComb_asym= ChainStep("Step1_2muComb_asym", [ muCombSequence(), muCombSequence()], multiplicity=2)
+ step1_2mufast_asym= ChainStep("Step1_2muFast_asym", [ muFastSequence(), muFastSequence()], multiplicity=[2])
+ step2_2muComb_asym= ChainStep("Step1_2muComb_asym", [ muCombSequence(), muCombSequence()], multiplicity=[2])
- step3_2muEFSA_asym= ChainStep("Step3_2muEFSA_asym", [ muEFSASequence(), muEFSASequence()], multiplicity=2)
- step4_2muEFCB_asym= ChainStep("Step4_2muEFCB_asym", [ muEFCBSequence(), muEFCBSequence()], multiplicity=2)
+ step3_2muEFSA_asym= ChainStep("Step3_2muEFSA_asym", [ muEFSASequence(), muEFSASequence()], multiplicity=[2])
+ step4_2muEFCB_asym= ChainStep("Step4_2muEFCB_asym", [ muEFCBSequence(), muEFCBSequence()], multiplicity=[2])
MuonChains += [ makeChain(name='HLT_mu6_mu4_L12MU4',
@@ -221,7 +221,7 @@ if opt.doMETSlice == True:
metCellStep = ChainStep("Step1_met_cell", [metCellSeq])
metClusterPufitStep = ChainStep("Step1_met_clusterpufit", [metClusterPufitSeq])
- comboStep_cell_clusterpufit = ChainStep("Step1_combo_cell_clusterpufit", [metCellSeq, metClusterPufitSeq], multiplicity=2)
+ comboStep_cell_clusterpufit = ChainStep("Step1_combo_cell_clusterpufit", [metCellSeq, metClusterPufitSeq], multiplicity=[2])
metChains = [
makeChain(name="HLT_xe65_L1XE50", L1Thresholds=["XE50"], ChainSteps=[metCellStep]),
@@ -274,8 +274,8 @@ if opt.doCombinedSlice == True:
from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence
- comboStep_et_mufast = ChainStep("Step1_et_mufast", [fastCaloSeq, muFastSequence()], multiplicity=2)
- comboStep_mufast_etcut1_step1 = ChainStep("Step1_mufast_etcut1", [muFastSequence(), fastCaloSeq], multiplicity=2)
+ comboStep_et_mufast = ChainStep("Step1_et_mufast", [fastCaloSeq, muFastSequence()], multiplicity=[2])
+ comboStep_mufast_etcut1_step1 = ChainStep("Step1_mufast_etcut1", [muFastSequence(), fastCaloSeq], multiplicity=[2])
comboChains = [ makeChain(name='HLT_e3_etcut_mu6_L1EM8I_MU10', L1Thresholds=["EM8I", "MU10"], ChainSteps=[comboStep_et_mufast ])]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
index 6cb66d71d496ae78738d87190566df6a7960b97b..41a4a4e920e1ad6496a70693bd9a6256e1c2c6aa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -49,7 +49,6 @@ def mergeParallel(chainDefList, offset):
myOrderedSteps = deepcopy(orderedSteps)
combChainSteps =[]
- # why do we need to order he steps?
for steps in myOrderedSteps:
mySteps = list(steps)
combStep = makeChainSteps(mySteps)
@@ -82,8 +81,9 @@ def makeChainSteps(steps):
for step in steps:
if step is None:
continue
+ # this function only works if the input chains are single-object chains (one menu seuqnce)
if len(step.sequences) > 1:
- log.error("More than one menu sequence found in combined chain!!") # why cannot happen?
+ log.error("More than one menu sequence found in combined chain!!")
seq = step.sequences[0]
log.debug(" step type %s", type(step.sequences))
log.debug(" step.name %s", step.name)
@@ -95,10 +95,11 @@ def makeChainSteps(steps):
stepNumber = stepNameParts[0]
# the step naming for combined chains needs to be revisted!!
- stepName += '_' +step.name #stepNumber + '_' + stepNameParts[1]
+ stepName += '_' +step.name
stepSeq.append(seq)
+ # set the multiplicity of all the legs
stepMult.append(sum(step.multiplicity))
- #stepMult += step.multiplicity
+
log.debug(" - BB stepName %s", stepName)
log.debug(" - BB stepSeq %s", stepSeq)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 18b027ba46bcfe1ef33deda8a119510b6033cc85..4802ac31f359b537a1e4d02c68b3f86ba46e1279 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -572,9 +572,9 @@ class CFSequence(object):
class ChainStep(object):
- """Class to describe one step of a chain; if multiplicity is greater than 1, the step is combo/combined"""
+ """Class to describe one step of a chain; if multiplicity is greater than 1, the step is combo/combined. Set one multiplicity value per sequence"""
def __init__(self, name, Sequences=[], multiplicity=[1]):
- # one multiplicity value per sequence
+
self.name = name
self.sequences=[]
self.multiplicity = multiplicity