diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
index 4788082778a704eabef42d44a5b50a705b641c97..d0cd00cd1085c7c44573b5abde94018bc526388a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
@@ -102,7 +102,6 @@ def generateEmuEvents():
data['l1emroi'][1] = '1,1,0,EM3,EM5,EM7,EM20,EM50,EM100; 2.,-1.2,0,EM3,EM5,EM7; 3.,0.2,0,EM3;'
data['emclusters'][1]= 'eta:1,phi:1,et:180000; eta:1,phi:-1.2,et:6000; eta:0.5,phi:-1.2,et:3000;'
data['l1muroi'][1] = '2,0.5,0,MU6; 3,0.5,0,MU6;'
- #data['l1muroi'][1] = '0,0,0,MU0;'
data['msmu'][1] = 'eta:-1.2,phi:0.7,pt:1500,pt2:1500; eta:-1.1,phi:0.6,pt:1500,pt2:1500;'
# event 2: 2e+ 3mu : HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6, HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5
@@ -112,19 +111,21 @@ def generateEmuEvents():
HLT_TestChain8_muv1step_L1MU6 \
HLT_TestChain5_ev1_L1EM3 \
HLT_TestChain8_ev1_L1EM5 \
+ HLT_TestChain6_muEmpty2_L1MU6 \
HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 \
HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 \
HLT_2TestChain6_muv1_L12MU6 \
- HLT_2TestChain6_muEmpty_L12MU6 \
+ HLT_2TestChain6_muEmpty1_L12MU6 \
HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 \
HLT_2TestChain4_muv1_dr_L12MU6 HLT_e5_e8_L12EM3 \
- HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 \
- HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6 \
+ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 \
+ HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 \
+ HLT_TestChain10_muv1_TestChain6_muEmpty1_L1MU6 \
HLT_TestChain6_muv1_TestChain5_ev1_dr_L12MU6'
data['l1emroi'][2] = '2,0.2,0,EM3,EM5,EM7,EM15,EM20,EM50,EM100; 1,-1.1,0,EM3,EM5,EM7,EM15,EM20,EM50;'
data['emclusters'][2]= 'eta:0.5,phi:0,et:120000; eta:1,phi:-1.2,et:65000;'
data['l1muroi'][2] = '2,0.5,0,MU6,MU8; 3,0.5,0,MU6,MU8,MU10;2.2,0.6,0,MU6;'
- data['msmu'][2] = 'eta:-1.2,phi:0.7,pt:6500,pt2:8500; eta:-1.1,phi:0.6,pt:8500,pt2:8500;eta:-1.1,phi:0.6,pt:8500,pt2:8500;'
+ data['msmu'][2] = 'eta:-1.2,phi:0.7,pt:6500,pt2:8500; eta:-1.1,phi:0.6,pt:10500,pt2:8500;eta:-1.1,phi:0.6,pt:8500,pt2:8500;'
#event 3: 1e + 1mu; HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 does not pass because of e10
data['ctp'] [3] = 'HLT_TestChain20_muv1_L1MU10 \
@@ -199,14 +200,14 @@ def generateChainsManually():
step_mu32 = ChainStep("Step3_mu32", [mu32] )
step_mu41 = ChainStep("Step4_mu41", [mu41] )
- step_empy= ChainStep("Step2_empty")
+ step_empy= ChainStep("Step2_mu1empty", multiplicity=[])
MuChains = [
makeChain(name='HLT_TestChain8_muv1step_L1MU6', L1Thresholds=["MU6"], ChainSteps=[step_mu11]),
makeChain(name='HLT_TestChain8_muv1_L1MU10', L1Thresholds=["MU10"], ChainSteps=[step_mu11 , step_mu21 , step_mu31, step_mu41] ),
makeChain(name='HLT_TestChain20_muv1_L1MU10', L1Thresholds=["MU10"], ChainSteps=[step_mu11 , step_mu21 , step_mu31, step_mu41] ),
makeChain(name='HLT_TestChain10_muv2_L1MU10', L1Thresholds=["MU10"], ChainSteps=[step_mu11 , step_mu22 , step_mu31] ),
- makeChain(name='HLT_TestChain6_muEmpty_L1MU6', L1Thresholds=["MU6"], ChainSteps=[step_mu11 , step_empy , step_mu32, step_mu41] ),
+ makeChain(name='HLT_TestChain6_muEmpty2_L1MU6', L1Thresholds=["MU6"], ChainSteps=[step_mu11 , step_empy , step_mu32, step_mu41] ),
]
@@ -221,6 +222,7 @@ def generateChainsManually():
el22 = elMenuSequence(step="2",reconame="v2", hyponame="v2")
el23 = elMenuSequence(step="2",reconame="v2", hyponame="v3")
el31 = elMenuSequence(step="3",reconame="v1", hyponame="v1")
+ el41 = elMenuSequence(step="4",reconame="v1", hyponame="v1")
# gamma
gamm11 = gamMenuSequence("1", reconame="v1", hyponame="v1")
@@ -240,10 +242,12 @@ def generateChainsManually():
if doCombo:
emptySeq1 = EmptyMenuSequence("step1EmptySeqence")
emptySeq2 = EmptyMenuSequence("step2EmptySeqence")
+
if not doElectron:
from TrigUpgradeTest.HLTSignatureConfig import elMenuSequence
el11 = elMenuSequence(step="1",reconame="v1", hyponame="v1")
el21 = elMenuSequence(step="2",reconame="v1", hyponame="v1")
+ el41 = elMenuSequence(step="4",reconame="v1", hyponame="v1")
if not doMuon:
from TrigUpgradeTest.HLTSignatureConfig import muMenuSequence
@@ -270,7 +274,9 @@ def generateChainsManually():
# This is an example of a chain running in "serial"
makeChain(name='HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
ChainStep("Step1_mu_em_serial", [mu11, emptySeq1], multiplicity=[1,1]),
- ChainStep("Step2_mu_em_serial", [emptySeq2, el21], multiplicity=[1,1])] ),
+ ChainStep("Step2_mu_em_serial", [emptySeq2, el21], multiplicity=[1,1]),
+ ChainStep("Step3_mu_em_serial", multiplicity=[]),
+ ChainStep("Step4_mu_em_serial", [mu41, el41], multiplicity=[1,1])] ),
makeChain(name='HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
ChainStep("Step1_mu2_em", [mu12, el11], multiplicity=[1,1]),
@@ -280,7 +286,7 @@ def generateChainsManually():
ChainStep("Step1_2emAs", [el11, el11], multiplicity=[1,1]),
ChainStep("Step2_2emAs", [el21, el21], multiplicity=[1,1]) ]),
- makeChain(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6', L1Thresholds=["EM3","EM5","MU6"], ChainSteps=[
+ makeChain(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6', L1Thresholds=["EM3","EM5","MU6"], ChainSteps=[
ChainStep("Step1_2em_2mu", [el11,el11,mu11], multiplicity=[1,1,2]),
ChainStep("Step2_2em_2mu", [el21,el21,mu21], multiplicity=[1,1,2]) ]),
@@ -292,8 +298,8 @@ def generateChainsManually():
ChainStep("Step1_2muAs", [mu11,mu11], multiplicity=[1,1]),
ChainStep("Step2_2muAs", [mu21,mu21], multiplicity=[1,1]) ]),
- makeChain(name='HLT_2TestChain6_muEmpty_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
- ChainStep("Step1_2mu_empty", multiplicity=[2]),
+ makeChain(name='HLT_2TestChain6_muEmpty1_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
+ ChainStep("Step1_2mu_empty", multiplicity=[]),#[2]
ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
makeChain(name='HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6', L1Thresholds=["MU6","EM5"], ChainSteps=[
@@ -303,10 +309,13 @@ def generateChainsManually():
makeChain(name='HLT_2TestChain4_muv1dr_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
ChainStep("Step1_2mu", [mu11], multiplicity=[2], comboToolConfs=[dimuDrComboHypoTool]),
ChainStep("Step2_2mu22", [mu22], multiplicity=[2]) ] ),
-
- makeChain(name='HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6', L1Thresholds=["MU6", "FSNOSEED"], ChainSteps=[
- ChainStep("Step1_2muAs", [mu11, mu11], multiplicity=[1,1]),
+
+ # FSNOSEED not implemented in emulation
+ # L1Thresholds=["MU6", "MU6"],
+ makeChain(name='HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6', L1Thresholds=["MU6", "MU6"], ChainSteps=[
+ ChainStep("Step1_2muAs_empty", multiplicity=[]),
ChainStep("Step2_2muAs", [mu21, mu21], multiplicity=[1,1]) ])
+
]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
index 793ece34ea4445ed286e043914f44b723fb93993..8990dd80e54fb34fd4d958e7d8a8e8798012ce95 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
@@ -40,7 +40,7 @@ for option in defaultOptions:
else:
print(' %20s = (Default) %s' % (option, getattr(opt, option)))
-
+TriggerFlags.generateMenuDiagnostics=True
topSequence = AlgSequence()
if opt.doMenu is True:
@@ -70,4 +70,3 @@ dumpSequence( topSequence )
theApp.EvtMax = 4
-TriggerFlags.generateMenuDiagnostics=True
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
index 76bd11507d3c05b4ab1170a1fcf27039c1a4732c..a81860b7412a01ba01f9c6c032debb3f98c34321 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
@@ -10,43 +10,61 @@ TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev3
TriggerSummaryStep3 1 0 DEBUG In summary 2 chains passed:
TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG In summary 18 chains passed:
+TriggerSummaryStep1 2 0 DEBUG In summary 23 chains passed:
+TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#171620884
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty_L12MU6 ID#241766530
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6 ID#1462041536
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1601708571
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1777912350
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
+TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3196402061
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#3575185873
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain10_muv2_L1MU10 ID#3482819675
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1step_L1MU6 ID#3588359947
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3844733695
+TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 2 0 DEBUG In summary 14 chains passed:
+TriggerSummaryStep2 2 0 DEBUG In summary 19 chains passed:
+TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#171620884
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty_L12MU6 ID#241766530
+TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1601708571
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1777912350
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
+TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2764921170
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#3575185873
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 2 0 DEBUG In summary 2 chains passed:
+TriggerSummaryStep3 2 0 DEBUG In summary 5 chains passed:
+TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
+TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
+TriggerSummaryStep4 2 0 DEBUG In summary 4 chains passed:
+TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
+TriggerSummaryStep4 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
+TriggerSummaryStep4 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
TriggerSummaryStep1 3 0 DEBUG In summary 10 chains passed:
TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
@@ -75,24 +93,27 @@ TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv
TrigSignatureMoniMT INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517
TrigSignatureMoniMT INFO -- #3176095517 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3176095517 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty_L12MU6 #241766530
-TrigSignatureMoniMT INFO -- #241766530 Events 1 1 0 1 - - 1
-TrigSignatureMoniMT INFO -- #241766530 Features 0 6 - -
+TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418
+TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 0 1 - - 1
+TrigSignatureMoniMT INFO -- #2176116418 Features 0 6 - -
TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992
TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 - - 1
TrigSignatureMoniMT INFO -- #1408409992 Features 6 6 - -
+TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170
+TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 0 1 - - 1
+TrigSignatureMoniMT INFO -- #2764921170 Features 0 3 - -
TrigSignatureMoniMT INFO HLT_TestChain10_muv2_L1MU10 #3482819675
-TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3482819675 Features 0 0 0 -
+TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 1 0 0 - 0
+TrigSignatureMoniMT INFO -- #3482819675 Features 1 0 0 -
TrigSignatureMoniMT INFO HLT_TestChain20_muv1_L1MU10 #356594709
TrigSignatureMoniMT INFO -- #356594709 Events 1 1 1 1 1 1 1
TrigSignatureMoniMT INFO -- #356594709 Features 1 1 1 1
TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305
TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2
TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 #171620884
-TrigSignatureMoniMT INFO -- #171620884 Events 1 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #171620884 Features 2 2 - -
+TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 #1820214917
+TrigSignatureMoniMT INFO -- #1820214917 Events 1 1 1 1 - - 1
+TrigSignatureMoniMT INFO -- #1820214917 Features 2 2 - -
TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009
TrigSignatureMoniMT INFO -- #2709794009 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2709794009 Features 0 0 - -
@@ -105,21 +126,18 @@ TrigSignatureMoniMT INFO -- #2336588294 Features
TrigSignatureMoniMT INFO HLT_TestChain5_gv1_L1EM7 #3893303900
TrigSignatureMoniMT INFO -- #3893303900 Events 1 1 1 - - - 1
TrigSignatureMoniMT INFO -- #3893303900 Features 2 - - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty_L1MU6 #3519633296
-TrigSignatureMoniMT INFO -- #3519633296 Events 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3519633296 Features 0 0 0 0
+TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900
+TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 0 1 1 1
+TrigSignatureMoniMT INFO -- #2511524900 Features 3 0 3 3
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772
-TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 - - 1
-TrigSignatureMoniMT INFO -- #64374772 Features 4 3 - -
+TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 0 1 1
+TrigSignatureMoniMT INFO -- #64374772 Features 4 3 0 3
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061
-TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3196402061 Features 0 0 - -
+TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 - - 0
+TrigSignatureMoniMT INFO -- #3196402061 Features 3 0 - -
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6 #3205587050
TrigSignatureMoniMT INFO -- #3205587050 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3205587050 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6 #293762221
-TrigSignatureMoniMT INFO -- #293762221 Events 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #293762221 Features 0 0 - -
TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373
TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 - - 2
TrigSignatureMoniMT INFO -- #3476793373 Features 4 4 - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
index 76bd11507d3c05b4ab1170a1fcf27039c1a4732c..a81860b7412a01ba01f9c6c032debb3f98c34321 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
@@ -10,43 +10,61 @@ TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev3
TriggerSummaryStep3 1 0 DEBUG In summary 2 chains passed:
TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG In summary 18 chains passed:
+TriggerSummaryStep1 2 0 DEBUG In summary 23 chains passed:
+TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#171620884
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty_L12MU6 ID#241766530
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6 ID#1462041536
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1601708571
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1777912350
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
+TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3196402061
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#3575185873
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain10_muv2_L1MU10 ID#3482819675
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1step_L1MU6 ID#3588359947
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3844733695
+TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 2 0 DEBUG In summary 14 chains passed:
+TriggerSummaryStep2 2 0 DEBUG In summary 19 chains passed:
+TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#171620884
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty_L12MU6 ID#241766530
+TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1601708571
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#1777912350
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
+TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2764921170
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 ID#3575185873
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 2 0 DEBUG In summary 2 chains passed:
+TriggerSummaryStep3 2 0 DEBUG In summary 5 chains passed:
+TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
+TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
+TriggerSummaryStep4 2 0 DEBUG In summary 4 chains passed:
+TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
+TriggerSummaryStep4 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
+TriggerSummaryStep4 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
+TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
TriggerSummaryStep1 3 0 DEBUG In summary 10 chains passed:
TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
@@ -75,24 +93,27 @@ TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv
TrigSignatureMoniMT INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517
TrigSignatureMoniMT INFO -- #3176095517 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3176095517 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty_L12MU6 #241766530
-TrigSignatureMoniMT INFO -- #241766530 Events 1 1 0 1 - - 1
-TrigSignatureMoniMT INFO -- #241766530 Features 0 6 - -
+TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418
+TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 0 1 - - 1
+TrigSignatureMoniMT INFO -- #2176116418 Features 0 6 - -
TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992
TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 - - 1
TrigSignatureMoniMT INFO -- #1408409992 Features 6 6 - -
+TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170
+TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 0 1 - - 1
+TrigSignatureMoniMT INFO -- #2764921170 Features 0 3 - -
TrigSignatureMoniMT INFO HLT_TestChain10_muv2_L1MU10 #3482819675
-TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3482819675 Features 0 0 0 -
+TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 1 0 0 - 0
+TrigSignatureMoniMT INFO -- #3482819675 Features 1 0 0 -
TrigSignatureMoniMT INFO HLT_TestChain20_muv1_L1MU10 #356594709
TrigSignatureMoniMT INFO -- #356594709 Events 1 1 1 1 1 1 1
TrigSignatureMoniMT INFO -- #356594709 Features 1 1 1 1
TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305
TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2
TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6 #171620884
-TrigSignatureMoniMT INFO -- #171620884 Events 1 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #171620884 Features 2 2 - -
+TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 #1820214917
+TrigSignatureMoniMT INFO -- #1820214917 Events 1 1 1 1 - - 1
+TrigSignatureMoniMT INFO -- #1820214917 Features 2 2 - -
TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009
TrigSignatureMoniMT INFO -- #2709794009 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2709794009 Features 0 0 - -
@@ -105,21 +126,18 @@ TrigSignatureMoniMT INFO -- #2336588294 Features
TrigSignatureMoniMT INFO HLT_TestChain5_gv1_L1EM7 #3893303900
TrigSignatureMoniMT INFO -- #3893303900 Events 1 1 1 - - - 1
TrigSignatureMoniMT INFO -- #3893303900 Features 2 - - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty_L1MU6 #3519633296
-TrigSignatureMoniMT INFO -- #3519633296 Events 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3519633296 Features 0 0 0 0
+TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900
+TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 0 1 1 1
+TrigSignatureMoniMT INFO -- #2511524900 Features 3 0 3 3
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772
-TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 - - 1
-TrigSignatureMoniMT INFO -- #64374772 Features 4 3 - -
+TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 0 1 1
+TrigSignatureMoniMT INFO -- #64374772 Features 4 3 0 3
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061
-TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3196402061 Features 0 0 - -
+TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 - - 0
+TrigSignatureMoniMT INFO -- #3196402061 Features 3 0 - -
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6 #3205587050
TrigSignatureMoniMT INFO -- #3205587050 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3205587050 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6 #293762221
-TrigSignatureMoniMT INFO -- #293762221 Events 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #293762221 Features 0 0 - -
TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373
TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 - - 2
TrigSignatureMoniMT INFO -- #3476793373 Features 4 4 - -
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
index 9d11cdaaae36e8aa62cebaedfb2a6b19c76e0e6d..8a87f2bf4d4aae94fa1ea806ea55f15b835dd623 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
@@ -50,7 +50,12 @@ class ChainConfigurationBase(object):
for sequenceCfg in sequenceCfgArray:
seqArray.append( RecoFragmentsPool.retrieve( sequenceCfg, None))
return ChainStep(stepName, seqArray, [self.mult], [self.dict], comboHypoCfg=comboHypoCfg, comboToolConfs=comboTools)
-
+
+ def getEmptyStep(self, stepID, stepPartName):
+ stepName = 'Step%d'%stepID + '_%d'%self.mult + stepPartName
+ log.debug("Configuring empty step " + stepName)
+ return ChainStep(stepName, [], multiplicity=[] )
+
def buildChain(self, chainSteps):
myChain = Chain(name = self.chainName,
ChainSteps = chainSteps,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index 51bcd54ef0ea001dc3b8db61e8cfc5e962cbab7b..e11f590ab7f860528c34e5293b1c456a7d14b832 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -340,6 +340,7 @@ def createDataFlow(chains, allDicts):
sequenceFilter= None
filterName = CFNaming.filterName(chainStep.name)
filterOutput =[ CFNaming.filterOutName(filterName, inputName) for inputName in filterInput ]
+ log.debug("Filter outputps: %s", filterOutput)
(foundFilter, foundCFSeq) = findCFSequences(filterName, CFseqList[nstep])
log.debug("Found %d CF sequences with filter name %s", foundFilter, filterName)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
index 99de9df2c1e65392fb4396dfa4974b58db5a65a0..b2880c39d274e41e5e9dd341cced03cc2190f6bd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
@@ -33,7 +33,7 @@ def setupMenu():
ChainProp(name='HLT_TestChain8_muv1_L1MU10', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_TestChain20_muv1_L1MU10',stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_TestChain10_muv2_L1MU10',stream=['Main'], groups=['RATE:Test','BW:Other'] ),
- ChainProp(name='HLT_TestChain6_muEmpty_L1MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
+ ChainProp(name='HLT_TestChain6_muEmpty2_L1MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
# egamma
ChainProp(name='HLT_TestChain5_ev1_L1EM3', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
@@ -46,14 +46,15 @@ def setupMenu():
ChainProp(name='HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5', stream=['Main'], groups=['RATE:Test','BW:Other'] ), #serial
ChainProp(name='HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_TestChain5_ev1_TestChain8_ev1_L12EM3', stream=['Main'], groups=['RATE:Test','BW:Other']),
- # ChainProp(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
+ ChainProp(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_2TestChain6_muv1_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_TestChain6_muv1_TestChain10_muv1_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
- ChainProp(name='HLT_2TestChain6_muEmpty_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other']), #may differ from manual
- ChainProp(name='HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
+ ChainProp(name='HLT_2TestChain6_muEmpty1_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other']), #may differ from manual
+ ChainProp(name='HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_2TestChain4_muv1dr_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
-
- # problem here ChainProp(name='HLT_TestChain6_muv1_TestChain6_muEmpty_L1MU6', l1SeedThresholds=['MU6','FSNOSEED'], stream=['Main'], groups=['RATE:Test','BW:Other']) # revisit this
+
+ # FSNOSEED not implemented in emulation
+ ChainProp(name='HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6', l1SeedThresholds=['MU6','MU6'], stream=['Main'], groups=['RATE:Test','BW:Other'])
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 6d322b94600acea926cedb7a39a3581040062f25..dde45d1fcb9bbc56f1471c50cb002646a6623b52 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -770,8 +770,9 @@ class CFSequence(object):
def setDecisions(self):
""" Set the output decision of this CFSequence as the hypo outputdecision; In case of combo, takes the Combo outputs"""
self.decisions=[]
+ # empty steps:
if not len(self.step.sequences):
- self.decisions.extend(self.filter.readOutputList())
+ self.decisions.extend(self.filter.getOutputList())
else:
if self.step.isCombo:
self.decisions.extend(self.step.combo.getOutputList())
@@ -805,7 +806,7 @@ class CFSequence(object):
seq.connectToFilter( filter_out )
nseq+=1
else:
- log.debug("This CFSequence has no sequences: outputs are the Filter outputs")
+ log.debug("This CFSequence has no sequences: outputs are the Filter outputs, which are %d", len(self.decisions))
def connectCombo(self):
@@ -842,9 +843,7 @@ class ChainStep(object):
# sanity check on inputs
if len(Sequences) != len(multiplicity):
- # empty steps have one entry in multiplicity
- if not (len(Sequences)==0 and len(multiplicity)==1):
- raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i multiplicities. These lists must have the same size" % (name, len(Sequences), len(multiplicity)) )
+ raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i multiplicities. These lists must have the same size" % (name, len(Sequences), len(multiplicity)) )
self.name = name
self.sequences=Sequences
@@ -879,6 +878,8 @@ class ChainStep(object):
return list(self.combo.getChains())
def __repr__(self):
+ if len(self.sequences) == 0:
+ return "--- ChainStep %s ---\n is Empty, ChainDict = %s "%(self.name, ' '.join(map(str, [dic['chainName'] for dic in self.chainDicts])) )
if not self.isCombo:
return "--- ChainStep %s ---\n , multiplicity = %d ChainDict = %s \n + MenuSequences = %s "%(self.name, sum(self.multiplicity), ' '.join(map(str, [dic['chainName'] for dic in self.chainDicts])), ' '.join(map(str, [seq.name for seq in self.sequences]) ))
else:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 60c0cebdab7092fa24f270e66344de69838333f6..1018c922d09bd6492c744a620d2da9ebb5ebb65c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -66,7 +66,7 @@ TestChainParts = {
'signature' : ['Test'],
'chainPartName' : '',
'multiplicity' : '',
- 'extra' : ['muv1', 'muv1step', 'muv2', 'ev1', 'ev2', 'ev3', 'gv1', 'muEmpty', 'ev1dr', 'muv1dr'],
+ 'extra' : ['muv1', 'muv1step', 'muv2', 'ev1', 'ev2', 'ev3', 'gv1', 'muEmpty1', 'muEmpty2', 'ev1dr', 'muv1dr'],
'trigType' : ['TestChain'],
'threshold' : '',
'addInfo' : [''],
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index 1323d8e41d14e7df774419a0d5f8fdf6c270066a..92e9b57bb62f20b718e8413c68b2c14f76f68888 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -202,7 +202,7 @@ class MuonChainConfiguration(ChainConfigurationBase):
#--------------------
def getmuMSEmptyAll(self, stepID):
- return self.getStep(stepID,'muMS_empty',[])
+ return self.getEmptyStep(stepID,'muMS_empty')
#--------------------
def getmuMSEmpty(self):
@@ -210,11 +210,11 @@ class MuonChainConfiguration(ChainConfigurationBase):
#--------------------
def getmuFastEmpty(self):
- return self.getStep(1,'muFast_empty',[])
+ return self.getEmptyStep(1,'muFast_empty')
#--------------------
def getEFCBEmpty(self):
- return self.getStep(6,'EFCBEmpty',[])
+ return self.getEmptyStep(6,'EFCBEmpty')
#--------------------
def getLateMuRoI(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
index bb4e0ccac606b017bdf0d447e178382b6eb1c878..589c9ca420f480334301de0e0d87fbebe949502b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
@@ -88,14 +88,15 @@ class TestChainConfiguration(ChainConfigurationBase):
'muv1step': ['Step_mu11'],
'muv1': ['Step_mu11', 'Step_mu21', 'Step_mu31', 'Step_mu41'],
'muv2': ['Step_mu11', 'Step_mu22', 'Step_mu31'],
- 'muEmpty' : ['Step_mu11' ,'Step_empty' ,'Step_mu32', 'Step_mu41'],
- 'muv1dr' : ['Step_mu11Dr', 'Step_mu21'],
+ 'muEmpty1': ['Step_empty1', 'Step_mu21'],
+ 'muEmpty2': ['Step_mu11' ,'Step_empty2' ,'Step_mu32', 'Step_mu41'],
+ 'muv1dr' : ['Step_mu11Dr', 'Step_mu21'],
#egamma
'ev1': ['Step_em11', 'Step_em21', 'Step_em31'],
'ev2': ['Step_em11', 'Step_em22'],
'ev3': ['Step_em11', 'Step_em23'],
'gv1': ['Step_gam11'],
- 'ev1dr' : ['Step_em11Dr', 'Step_em21Dr']
+ 'ev1dr' : ['Step_em11Dr', 'Step_em21Dr']
}
log.debug('test chain part = ' + str(self.chainPart))
@@ -144,9 +145,11 @@ class TestChainConfiguration(ChainConfigurationBase):
def Step_mu41(self):
return self.getStep(4,"mu11",[ muCfg411 ])
- def Step_empty(self):
- return self.getStep(2, "empty", [])
+ def Step_empty1(self):
+ return self.getEmptyStep(1,'empty')
+ def Step_empty2(self):
+ return self.getEmptyStep(2,'empty')
# Electrons