From a8f43f0e74d0dce5b523579305f10860e1e4f882 Mon Sep 17 00:00:00 2001
From: Debottam Bakshi Gupta <debottam.bakshi.gupta@cern.ch>
Date: Wed, 25 Nov 2020 11:17:46 +0000
Subject: [PATCH] correcting eventView name in TriggerEDMRun3 and some C++
sanitization in TrigEgammaPrecisionEtcutHypoAlgMT
---
.../TrigEgammaPrecisionEtcutHypoTool.py | 13 +--
.../src/TrigEgammaPrecisionEtcutHypoAlgMT.cxx | 9 +-
.../src/TrigEgammaPrecisionEtcutHypoAlgMT.h | 4 +-
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 94 +++++++++----------
.../share/ref_data_v1Dev_build.ref | 76 +++++++--------
.../TrigEDMConfig/python/TriggerEDMRun3.py | 2 +-
.../Egamma/ElectronSequenceSetup.py | 5 +-
.../Egamma/PrecisionTrackingSequenceSetup.py | 1 -
.../PrecisionElectronRecoSequences.py | 1 +
9 files changed, 96 insertions(+), 109 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionEtcutHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionEtcutHypoTool.py
index 93df21968a2e..dc8ce649c0b2 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionEtcutHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionEtcutHypoTool.py
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-def _IncTool(name, threshold, sel):
+def _IncTool(name):
from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaPrecisionEtcutHypoTool
@@ -12,16 +12,9 @@ def _IncTool(name, threshold, sel):
def TrigEgammaPrecisionEtcutHypoToolFromDict( d ):
""" Use menu decoded chain dictionary to configure the tool """
- cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
-
- def __th(cpart):
- return cpart['threshold']
-
- def __sel(cpart):
- return cpart['addInfo'][0] if cpart['addInfo'] else cpart['IDinfo']
name = d['chainName']
- return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ) )
-
+ #return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ) )
+ return _IncTool( name )
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.cxx
index 26f4ee9e12fd..da60633b8c3e 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.cxx
@@ -18,9 +18,6 @@ TrigEgammaPrecisionEtcutHypoAlgMT::TrigEgammaPrecisionEtcutHypoAlgMT( const std:
StatusCode TrigEgammaPrecisionEtcutHypoAlgMT::initialize() {
ATH_CHECK( m_hypoTools.retrieve() );
- ATH_CHECK( m_clustersKey.initialize() );
- renounce( m_clustersKey );// clusters are made in views, so they are not in the EvtStore: hide them
-
return StatusCode::SUCCESS;
}
@@ -35,19 +32,19 @@ StatusCode TrigEgammaPrecisionEtcutHypoAlgMT::execute( const EventContext& conte
// new output decisions
SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
- auto outputDecision = outputHandle.ptr();
+ DecisionContainer* outputDecision = outputHandle.ptr();
// input for decision
std::vector<ITrigEgammaPrecisionEtcutHypoTool::ClusterInfo> toolInput;
// loop over previous decisions
size_t counter=0;
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const Decision* previousDecision: *previousDecisionsHandle ) {
const auto featureEL = findLink<xAOD::CaloClusterContainer>( previousDecision, featureString() );
ATH_CHECK(featureEL.isValid());
auto d = newDecisionIn( outputDecision, name() );
- d->setObjectLink<>( featureString(), featureEL.link );
+ d->setObjectLink<xAOD::CaloClusterContainer>( featureString(), featureEL.link );
TrigCompositeUtils::linkToPrevious( d, decisionInput().key(), counter );
toolInput.emplace_back( d, previousDecision );
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.h
index dd156fca0673..4face508d29b 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionEtcutHypoAlgMT.h
@@ -31,9 +31,7 @@ class TrigEgammaPrecisionEtcutHypoAlgMT : public ::HypoBase {
private:
ToolHandleArray< ITrigEgammaPrecisionEtcutHypoTool > m_hypoTools { this, "HypoTools", {}, "Hypo tools" };
-
- SG::ReadHandleKey< xAOD::CaloClusterContainer > m_clustersKey { this, "CaloClusters", "CaloClusters", "CaloClusters in roi" };
-
+
};
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 09d8678d668d..ee1f577f9138 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -23,7 +23,7 @@ HLT_2e17_etcut_L12EM15VH:
3: 2
stepFeatures:
0: 12
- 1: 314
+ 1: 106
2: 16
3: 12
HLT_2e17_lhvloose_L12EM15VH:
@@ -59,9 +59,9 @@ HLT_2e3_etcut_L12EM3:
3: 20
stepFeatures:
0: 342
- 1: 3730
- 2: 796
- 3: 304
+ 1: 2214
+ 2: 784
+ 3: 300
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
stepCounts:
@@ -514,7 +514,7 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
8: 2
stepFeatures:
0: 2
- 1: 43
+ 1: 11
2: 4
3: 2
4: 2
@@ -532,7 +532,7 @@ HLT_e17_lhvloose_nod0_L1EM15VH:
4: 5
stepFeatures:
0: 6
- 1: 80
+ 1: 22
2: 9
3: 6
4: 5
@@ -545,7 +545,7 @@ HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
3: 1
stepFeatures:
0: 2
- 1: 20
+ 1: 9
2: 3
3: 2
HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH:
@@ -564,7 +564,7 @@ HLT_e24_lhvloose_L1EM20VH:
4: 5
stepFeatures:
0: 6
- 1: 80
+ 1: 22
2: 9
3: 6
4: 5
@@ -577,7 +577,7 @@ HLT_e26_etcut_L1EM22VHI:
3: 6
stepFeatures:
0: 7
- 1: 132
+ 1: 47
2: 7
3: 7
HLT_e26_lhloose_L1EM15VH:
@@ -590,7 +590,7 @@ HLT_e26_lhloose_L1EM15VH:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -604,7 +604,7 @@ HLT_e26_lhloose_L1EM22VHI:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -618,7 +618,7 @@ HLT_e26_lhmedium_L1EM15VH:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -632,7 +632,7 @@ HLT_e26_lhmedium_L1EM22VHI:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -648,7 +648,7 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
6: 2
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -664,7 +664,7 @@ HLT_e26_lhtight_L1EM15VH:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -678,7 +678,7 @@ HLT_e26_lhtight_L1EM22VHI:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -692,7 +692,7 @@ HLT_e26_lhtight_ivarloose_L1EM22VHI:
4: 3
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 3
@@ -706,7 +706,7 @@ HLT_e26_lhtight_ivarmedium_L1EM22VHI:
4: 3
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 3
@@ -720,7 +720,7 @@ HLT_e26_lhtight_ivartight_L1EM22VHI:
4: 3
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 3
@@ -734,7 +734,7 @@ HLT_e26_lhtight_nod0_L1EM22VHI:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -748,7 +748,7 @@ HLT_e26_lhtight_nod0_L1EM24VHI:
4: 4
stepFeatures:
0: 5
- 1: 63
+ 1: 17
2: 8
3: 5
4: 4
@@ -773,9 +773,9 @@ HLT_e3_etcut_L1EM3:
3: 20
stepFeatures:
0: 171
- 1: 1865
- 2: 398
- 3: 152
+ 1: 1107
+ 2: 392
+ 3: 150
HLT_e5_etcut_L1EM3:
eventCount: 20
stepCounts:
@@ -785,9 +785,9 @@ HLT_e5_etcut_L1EM3:
3: 20
stepFeatures:
0: 137
- 1: 1656
- 2: 190
- 3: 115
+ 1: 986
+ 2: 189
+ 3: 114
HLT_e5_lhloose_L1EM3:
eventCount: 4
stepCounts:
@@ -798,9 +798,9 @@ HLT_e5_lhloose_L1EM3:
4: 4
stepFeatures:
0: 55
- 1: 570
- 2: 90
- 3: 51
+ 1: 339
+ 2: 88
+ 3: 50
4: 5
HLT_e5_lhloose_noringer_L1EM3:
eventCount: 5
@@ -812,7 +812,7 @@ HLT_e5_lhloose_noringer_L1EM3:
4: 5
stepFeatures:
0: 56
- 1: 651
+ 1: 361
2: 103
3: 55
4: 6
@@ -826,9 +826,9 @@ HLT_e5_lhmedium_L1EM3:
4: 4
stepFeatures:
0: 54
- 1: 565
- 2: 88
- 3: 50
+ 1: 335
+ 2: 86
+ 3: 49
4: 5
HLT_e5_lhmedium_noringer_L1EM3:
eventCount: 4
@@ -840,7 +840,7 @@ HLT_e5_lhmedium_noringer_L1EM3:
4: 4
stepFeatures:
0: 48
- 1: 528
+ 1: 312
2: 81
3: 47
4: 5
@@ -854,9 +854,9 @@ HLT_e5_lhtight_L1EM3:
4: 4
stepFeatures:
0: 52
- 1: 546
- 2: 84
- 3: 48
+ 1: 321
+ 2: 82
+ 3: 47
4: 5
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 4
@@ -868,9 +868,9 @@ HLT_e5_lhtight_nod0_L1EM3:
4: 4
stepFeatures:
0: 52
- 1: 546
- 2: 84
- 3: 48
+ 1: 321
+ 2: 82
+ 3: 47
4: 5
HLT_e5_lhtight_noringer_L1EM3:
eventCount: 4
@@ -882,7 +882,7 @@ HLT_e5_lhtight_noringer_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 513
+ 1: 299
2: 73
3: 44
4: 5
@@ -896,7 +896,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 513
+ 1: 299
2: 73
3: 44
4: 5
@@ -910,7 +910,7 @@ HLT_e60_lhmedium_L1EM22VHI:
4: 2
stepFeatures:
0: 2
- 1: 34
+ 1: 10
2: 4
3: 2
4: 2
@@ -924,7 +924,7 @@ HLT_e60_lhmedium_nod0_L1EM22VHI:
4: 2
stepFeatures:
0: 2
- 1: 34
+ 1: 10
2: 4
3: 2
4: 2
@@ -937,7 +937,7 @@ HLT_e7_etcut_L1EM3:
3: 20
stepFeatures:
0: 89
- 1: 1124
+ 1: 670
2: 122
3: 78
HLT_e7_lhmedium_mu24_L1MU20:
@@ -954,7 +954,7 @@ HLT_e7_lhmedium_mu24_L1MU20:
8: 1
stepFeatures:
0: 9
- 1: 97
+ 1: 47
2: 13
3: 9
4: 2
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 3daf44711e76..b025d4a3582a 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -37,9 +37,9 @@ HLT_2e3_etcut_L12EM3:
3: 12
stepFeatures:
0: 94
- 1: 294
- 2: 180
- 3: 80
+ 1: 210
+ 2: 168
+ 3: 72
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I:
@@ -283,7 +283,7 @@ HLT_e12_lhloose_2mu10_L12MU10:
1: 1
stepFeatures:
0: 1
- 1: 14
+ 1: 11
HLT_e140_lhloose_L1EM22VHI:
eventCount: 0
HLT_e140_lhloose_nod0_L1EM22VHI:
@@ -359,9 +359,9 @@ HLT_e3_etcut_L1EM3:
3: 13
stepFeatures:
0: 48
- 1: 148
- 2: 91
- 3: 41
+ 1: 106
+ 2: 85
+ 3: 37
HLT_e5_etcut_L1EM3:
eventCount: 12
stepCounts:
@@ -371,21 +371,21 @@ HLT_e5_etcut_L1EM3:
3: 12
stepFeatures:
0: 41
- 1: 135
- 2: 51
- 3: 35
+ 1: 96
+ 2: 47
+ 3: 32
HLT_e5_lhloose_L1EM3:
eventCount: 0
stepCounts:
0: 10
- 1: 9
- 2: 8
- 3: 8
+ 1: 8
+ 2: 7
+ 3: 7
stepFeatures:
0: 19
- 1: 56
- 2: 21
- 3: 14
+ 1: 40
+ 2: 17
+ 3: 11
HLT_e5_lhloose_noringer_L1EM3:
eventCount: 0
stepCounts:
@@ -395,7 +395,7 @@ HLT_e5_lhloose_noringer_L1EM3:
3: 9
stepFeatures:
0: 15
- 1: 49
+ 1: 38
2: 27
3: 14
HLT_e5_lhmedium_L1EM3:
@@ -407,9 +407,9 @@ HLT_e5_lhmedium_L1EM3:
3: 8
stepFeatures:
0: 21
- 1: 60
- 2: 23
- 3: 16
+ 1: 43
+ 2: 19
+ 3: 13
HLT_e5_lhmedium_noringer_L1EM3:
eventCount: 0
stepCounts:
@@ -419,33 +419,33 @@ HLT_e5_lhmedium_noringer_L1EM3:
3: 8
stepFeatures:
0: 13
- 1: 47
+ 1: 38
2: 25
3: 12
HLT_e5_lhtight_L1EM3:
eventCount: 0
stepCounts:
0: 9
- 1: 8
- 2: 7
- 3: 7
+ 1: 7
+ 2: 6
+ 3: 6
stepFeatures:
0: 17
- 1: 46
- 2: 18
- 3: 12
+ 1: 33
+ 2: 14
+ 3: 9
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 0
stepCounts:
0: 9
- 1: 8
- 2: 7
- 3: 7
+ 1: 7
+ 2: 6
+ 3: 6
stepFeatures:
0: 17
- 1: 46
- 2: 18
- 3: 12
+ 1: 33
+ 2: 14
+ 3: 9
HLT_e5_lhtight_noringer_L1EM3:
eventCount: 0
stepCounts:
@@ -455,7 +455,7 @@ HLT_e5_lhtight_noringer_L1EM3:
3: 8
stepFeatures:
0: 13
- 1: 47
+ 1: 38
2: 25
3: 12
HLT_e5_lhtight_noringer_nod0_L1EM3:
@@ -467,7 +467,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
3: 8
stepFeatures:
0: 13
- 1: 47
+ 1: 38
2: 25
3: 12
HLT_e60_lhmedium_L1EM22VHI:
@@ -483,9 +483,9 @@ HLT_e7_etcut_L1EM3:
3: 11
stepFeatures:
0: 26
- 1: 89
- 2: 26
- 3: 20
+ 1: 67
+ 2: 24
+ 3: 18
HLT_e7_lhmedium_mu24_L1MU20:
eventCount: 0
HLT_eb_low_L1RD2_FILLED:
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 3a4aaf807ea4..7a7d524b736f 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -126,7 +126,7 @@ TriggerHLTListRun3 = [
('xAOD::TrackParticleContainer#HLT_IDTrack_Electron_FTF', 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_FTFAux.', 'BS ESD AODFULL', 'Egamma'),
- ('xAOD::TrackParticleContainer#HLT_IDTrack_Electron_IDTrig', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionElectronViews'),
+ ('xAOD::TrackParticleContainer#HLT_IDTrack_Electron_IDTrig', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionEtcutViews'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_IDTrigAux.', 'BS ESD AODFULL', 'Egamma'),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index fd5ba647e3ff..8b0c0fc42cc2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -1,7 +1,6 @@
#
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
-
from AthenaConfiguration.AllConfigFlags import ConfigFlags
# menu components
@@ -32,8 +31,8 @@ def fastElectronSequence(ConfigFlags):
if "InDetTrigTrackParticleCreatorAlg" in viewAlg.name():
TrackParticlesName = viewAlg.TrackParticlesName
- from TrigEgammaHypo.TrigEgammaFastElectronFexMTConfig import EgammaFastElectronFex_1
- theElectronFex= EgammaFastElectronFex_1()
+ from TrigEgammaHypo.TrigEgammaFastElectronFexMTConfig import EgammaFastElectronFex_Clean
+ theElectronFex= EgammaFastElectronFex_Clean()
theElectronFex.TrigEMClusterName = CaloMenuDefs.L2CaloClusters
theElectronFex.TrackParticlesName = TrackParticlesName
theElectronFex.ElectronsName=recordable("HLT_FastElectrons")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionTrackingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionTrackingSequenceSetup.py
index 59c102ccd2dd..eb6308f137f0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionTrackingSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionTrackingSequenceSetup.py
@@ -45,7 +45,6 @@ def precisionTrackingMenuSequence(name):
from TrigEgammaHypo.TrigEgammaPrecisionEtcutHypoTool import TrigEgammaPrecisionEtcutHypoToolFromDict
thePrecisionEtcutHypo = TrigEgammaPrecisionEtcutHypoAlgMT(name+"precisionEtcutHypo")
- thePrecisionEtcutHypo.CaloClusters = caloclusters
return MenuSequence( Sequence = sequence,
Maker = precisionEtcutViewsMaker,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index d3afae969162..1e795360a20c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -81,3 +81,4 @@ def precisionElectronRecoSequence(RoIs):
thesequence += PrecisionElectronSuperClusterMonAlgo
return (thesequence, collectionOut)
+
--
GitLab