diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
index 3d4b4067f1859857366c4431c45ce63fe2f980f9..9ed2ef7db32331853cd13a03cba96dc977e924ed 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
@@ -8,12 +8,12 @@ TrigSignatureMoniMT INFO HLT_2mu6_L1MU6
TrigSignatureMoniMT INFO HLT_2mu6_L1MU6 decisions 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 20 20 18 0 0 0 18
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 decisions 54 0 0 0
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 0 0 17
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 342 0 0
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 0 0 16
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 329 0 0
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 0 0 14
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 264 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 16 0 16
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 343 47 0
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 15 0 15
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 330 45 0
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 13 0 13
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 265 31 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 2 2 0 2
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 2 2 0
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 2
@@ -27,4 +27,4 @@ TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisi
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 20 20 12 0 0 0 12
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 12 0 0 0
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 20 20 3 0 0 0 3
-TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 3 0 0 0
\ No newline at end of file
+TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 3 0 0 0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 2f2755fdce114abee6b05541eeb3ea9f45d09ddb..30e8eec44fea20c4fa97c12eedd71d058df4594f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -10,7 +10,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragm
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence, inDetSetup
-
+from TriggerMenuMT.HLTMenuConfig.CommonSequences.precisionCaloSequenceSetup import precisionCaloMenuSequence
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
# so let's make them functions already now
@@ -24,7 +24,8 @@ def electronSequenceCfg( flags ):
inDetSetup()
return electronMenuSequence()
-
+def precisionCaloSequenceCfg( flags ):
+ return precisionCaloMenuSequence()
#----------------------------------------------------------------
# Class to configure chain
@@ -51,6 +52,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
elif 'etcut' in self.chainPart['addInfo']:
myStepNames += ["Step1_etcut"]
myStepNames += ["Step2_etcut"]
+ myStepNames += ["Step3_etcut"]
for step in myStepNames:
chainSteps += [self.getEtCutStep(step)]
else:
@@ -64,15 +66,19 @@ class ElectronChainConfiguration(ChainConfigurationBase):
# --------------------
def getEtCutStep(self, stepName):
if stepName == "Step1_etcut":
- log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
- chainStep =ChainStep(stepName, [fastCalo])
+ log.debug("Configuring step " + stepName)
+ fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
+ chainStep =ChainStep(stepName, [fastCalo])
elif stepName == "Step2_etcut":
- log.debug("Configuring step " + stepName)
- electronReco = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
- chainStep=ChainStep(stepName, [electronReco])
+ log.debug("Configuring step " + stepName)
+ electronReco = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
+ chainStep=ChainStep(stepName, [electronReco])
+ elif stepName == "Step3_etcut":
+ log.debug("Configuring step " + stepName)
+ precisionReco = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
+ chainStep=ChainStep(stepName, [precisionReco])
else:
- raise RuntimeError("chainStepName unknown: " + stepName )
+ raise RuntimeError("chainStepName unknown: " + stepName )
log.debug("Returning chainStep from getEtCutStep function: " + stepName)
return chainStep