From c1fc024b5d2e4cf54df0c432d32ee81c0ca9b43d Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Thu, 17 Dec 2020 21:43:56 +0000
Subject: [PATCH] Fixed saving decorations from SP counts
---
.../TrigOutputHandling/src/HLTEDMCreator.cxx | 12 ++----------
.../TrigEDMConfig/python/TriggerEDMRun3.py | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
index 1ebbc05f0eff..3ed35a16063f 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
@@ -342,13 +342,7 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
}
-#define CREATE_XAOD_NO_MERGE(__TYPE, __STORE_TYPE) \
- { \
- xAODGenerator<xAOD::__TYPE, xAOD::__STORE_TYPE> generator; \
- ATH_CHECK( createIfMissing<xAOD::__TYPE>( context, ConstHandlesGroup<xAOD::__TYPE>( m_##__TYPE, m_##__TYPE##InViews, m_##__TYPE##Views ), generator, &HLTEDMCreator::noMerge<xAOD::__TYPE> ) ); \
- }
-
- CREATE_XAOD_NO_MERGE( TrigCompositeContainer, TrigCompositeAuxContainer );
+ CREATE_XAOD( TrigCompositeContainer, TrigCompositeAuxContainer );
CREATE_XAOD( TrigElectronContainer, TrigElectronAuxContainer );
CREATE_XAOD( ElectronContainer, ElectronAuxContainer );
CREATE_XAOD( PhotonContainer, PhotonAuxContainer );
@@ -366,18 +360,16 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
CREATE_XAOD( TauJetContainer, TauJetAuxContainer );
CREATE_XAOD( TauTrackContainer, TauTrackAuxContainer );
CREATE_XAOD( CaloClusterContainer, CaloClusterTrigAuxContainer ); // NOTE: Difference in interface and aux
- // After view collections are merged, need to update collection links
-
CREATE_XAOD( JetContainer, JetAuxContainer );
CREATE_XAOD( VertexContainer,VertexAuxContainer );
CREATE_XAOD( TrigBphysContainer, TrigBphysAuxContainer );
CREATE_XAOD( BTaggingContainer,BTaggingAuxContainer );
CREATE_XAOD( BTagVertexContainer,BTagVertexAuxContainer );
+ // After view collections are merged, need to update collection links
ATH_CHECK( fixLinks() );
#undef CREATE_XAOD
-#undef CREATE_XAOD_NO_MERGE
// special cases
#define CREATE_SHALLOW(__TYPE) \
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 2b2c6f4cb2d3..c407db4b6584 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -526,7 +526,7 @@ TriggerHLTListRun3 = [
('ROIB::RoIBResult#*', 'ESD', 'Misc'),
- ('xAOD::TrigCompositeContainer#HLT_SpacePointCounts', 'BS ESD AODFULL AODSLIM', 'MinBias'),
+ ('xAOD::TrigCompositeContainer#HLT_SpacePointCounts', 'BS ESD AODFULL AODSLIM', 'MinBias', 'inViews:SPView'),
('xAOD::TrigCompositeAuxContainer#HLT_SpacePointCountsAux.totNumPixSP.totNumPixCL_1.totNumPixCL_2.totNumPixCLmin3.pixClBarrel.pixClEndcapA.pixClEndcapC.totNumSctSP.SctSpBarrel.SctSpEndcapA.SctSpEndcapC', 'BS ESD AODFULL AODSLIM', 'MinBias'),
('xAOD::TrigCompositeContainer#HLT_TrackCount', 'BS ESD AODFULL AODSLIM', 'MinBias'),
--
GitLab