From f1377152caf04725c95955d5bbe3b4347a01350d Mon Sep 17 00:00:00 2001
From: Fernando Monticelli <fernando.monticelli@cern.ch>
Date: Mon, 27 May 2019 14:05:02 +0000
Subject: [PATCH] Re enable precision calo for electrons
---
.../TrigT2CaloCommon/python/CaloDef.py | 2 +-
.../TrigUpgradeTest/share/full_menu.py | 19 ++++---
.../TrigUpgradeTest/share/full_menu_build.ref | 57 +++++++++++++++++--
.../TrigUpgradeTest/share/slice_electron.ref | 16 +++---
.../HLTMenuConfig/Egamma/ElectronDef.py | 8 +--
.../HLTMenuConfig/Egamma/PrecisionCaloRec.py | 4 +-
6 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index e1d62326f44..3642df254d1 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -30,7 +30,7 @@ def _algoHLTCaloCell(name="HLTCaloCellMaker", inputEDM='FSRoI', outputEDM='Cells
def _algoHLTTopoCluster(inputEDM="CellsClusters", OutputLevel=ERROR, algSuffix="") :
from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
algo = TrigCaloClusterMakerMT_topo(name="TrigCaloClusterMakerMT_topo"+algSuffix, doMoments=True, doLC=False, cells=inputEDM)
- algo.CaloClusters="caloclusters"
+ algo.CaloClusters="HLT_TopoCaloCluster"
algo.OutputLevel=OutputLevel
return algo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
index 4ddb6ed8230..5c8f29000b5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
@@ -17,7 +17,7 @@ include("TrigUpgradeTest/testHLT_MT.py")
##########################################
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, RecoFragmentsPool
testChains = []
@@ -32,17 +32,20 @@ inDetSetup()
if opt.doElectronSlice == True:
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
- fastCaloStep=fastCaloMenuSequence("Ele")
- electronStep=electronMenuSequence()
+ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import fastCaloSequenceCfg, electronSequenceCfg, precisionCaloSequenceCfg
+ fastCaloStep = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None )
+ electronStep = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
+ precisionCaloStep = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
- step1=ChainStep("Step1_etcut", [fastCaloStep])
- step2=ChainStep("Step2_etcut", [electronStep])
+ step1=ChainStep("ElectronFastCalo", [fastCaloStep])
+ step2=ChainStep("ElectronFastTrack", [electronStep])
+ step3=ChainStep("ElectronPrecisionCalo", [precisionCaloStep])
egammaChains = [
Chain(name='HLT_e3_etcut1step', Seed="L1_EM3", ChainSteps=[step1] ),
- Chain(name='HLT_e3_etcut', Seed="L1_EM3", ChainSteps=[step1, step2] ),
- Chain(name='HLT_e5_etcut', Seed="L1_EM3", ChainSteps=[step1, step2] ),
- Chain(name='HLT_e7_etcut', Seed="L1_EM3", ChainSteps=[step1, step2] )
+ Chain(name='HLT_e3_etcut', Seed="L1_EM3", ChainSteps=[step1, step2, step3] ),
+ Chain(name='HLT_e5_etcut', Seed="L1_EM3", ChainSteps=[step1, step2, step3] ),
+ Chain(name='HLT_e7_etcut', Seed="L1_EM3", ChainSteps=[step1, step2, step3] )
]
testChains += egammaChains
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 8d9a4f1e79a..479a86da8ca 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -9,6 +9,9 @@ TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 0 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 1 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 1 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -20,6 +23,9 @@ TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 1 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 2 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
@@ -29,6 +35,9 @@ TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 2 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 3 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 3 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -40,6 +49,9 @@ TriggerSummaryStep2 3 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 3 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 4 0 DEBUG +++ HLT_mu6nol1 ID#1250234908
TriggerSummaryStep1 4 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -50,6 +62,8 @@ TriggerSummaryStep2 4 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 4 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 4 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 4 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6msonly ID#127605903
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep1 5 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
@@ -71,6 +85,9 @@ TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu6 ID#16721627
TriggerSummaryStep2 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 5 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep3 5 0 DEBUG +++ HLT_mu20_ivar ID#267444585
+TriggerSummaryStep3 5 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 5 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6msonly ID#127605903
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep1 6 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
@@ -93,7 +110,9 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut ID#243
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6msonly ID#127605903
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu20_ivar ID#267444585
+TriggerSummaryStep3 6 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6 ID#1672162766
+TriggerSummaryStep3 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 7 0 DEBUG +++ HLT_mu6nol1 ID#1250234908
@@ -105,6 +124,9 @@ TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 7 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 7 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 8 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 8 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -115,6 +137,9 @@ TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 8 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 8 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 9 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 10 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -126,6 +151,9 @@ TriggerSummaryStep2 10 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 10 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 11 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
@@ -133,6 +161,8 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut ID#271
TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep2 11 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 11 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 12 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 12 0 DEBUG +++ HLT_xe65_L1XE50 ID#1283272884
@@ -144,6 +174,9 @@ TriggerSummaryStep2 12 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 12 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 13 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
@@ -153,6 +186,9 @@ TriggerSummaryStep2 13 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 13 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 13 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 13 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe65_L1XE50 ID#1283272884
@@ -162,6 +198,8 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut ID#271
TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep2 14 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 14 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6msonly ID#127605903
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb ID#393364983
@@ -174,6 +212,7 @@ TriggerSummaryStep1 16 0 DEBUG +++ HLT_xe30_L1XE10 ID#
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe65_L1XE50 ID#1283272884
@@ -185,6 +224,9 @@ TriggerSummaryStep2 17 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 17 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 18 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
@@ -203,6 +245,9 @@ TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 19 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 20 20 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 decisions 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 20 20 0 0 0 0 0
@@ -219,16 +264,16 @@ TrigSignatureMoniMT INFO HLT_3j200
TrigSignatureMoniMT INFO HLT_3j200 decisions 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240 20 20 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 0 0 17
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 343 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17 0 17
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 343 91 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 0 0 18
TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 20 20 10 0 0 0 1
TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 decisions 17 0 0 0
-TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 0 0 16
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 330 0 0
-TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 0 0 14
-TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 265 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16 0 16
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 330 54 0
+TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 12 0 12
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 265 28 0
TrigSignatureMoniMT INFO HLT_g5_etcut 20 20 17 17 0 0 17
TrigSignatureMoniMT INFO HLT_g5_etcut decisions 50 50 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet20 20 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_electron.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_electron.ref
index 91754c646a8..b5b8c00bfdf 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_electron.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_electron.ref
@@ -1,8 +1,8 @@
-TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 342
-TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
-TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0
-TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 329
-TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14
-TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 264
+TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17 17
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 342 91
+TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 0 18
+TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16 16
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 329 54
+TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 12 12
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 264 28
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 68c7986fea7..3bfdc4f6634 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -12,7 +12,7 @@ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCa
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
from TrigUpgradeTest.InDetSetup import inDetSetup
-#from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
+from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
@@ -20,14 +20,14 @@ from TrigUpgradeTest.InDetSetup import inDetSetup
#----------------------------------------------------------------
def fastCaloSequenceCfg( flags ):
- return fastCaloMenuSequence("Electron")
+ return fastCaloMenuSequence("ElectronFastCalo")
def electronSequenceCfg( flags ):
inDetSetup()
return electronMenuSequence()
-#def precisionCaloSequenceCfg( flags ):
-# return precisionCaloMenuSequence()
+def precisionCaloSequenceCfg( flags ):
+ return precisionCaloMenuSequence()
#----------------------------------------------------------------
# Class to configure chain
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRec.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRec.py
index f2027b3dbba..36ab1e9c349 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRec.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRec.py
@@ -18,8 +18,8 @@ def precisionCaloRecoSequence(RoIs):
OutputTopoCollectionShallow="tmp_"+jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
doAdd = False )
- from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
- (precisionRecoSequence, caloclusters) = RecoFragmentsPool.retrieve(HLTFSTopoRecoSequence, RoIs)
+ from TrigT2CaloCommon.CaloDef import HLTRoITopoRecoSequence
+ (precisionRecoSequence, caloclusters) = RecoFragmentsPool.retrieve(HLTRoITopoRecoSequence, RoIs)
algo = egammaTopoClusterCopier()
algo.InputTopoCollection = caloclusters
--
GitLab