From 3a943df4568b18c89e7143bfca696a84efc52b63 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Tue, 30 Jul 2024 11:28:33 +0200 Subject: [PATCH] Switch to new link type names --- k4FWCore/components/CollectionMerger.cpp | 36 +++++++++--------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/k4FWCore/components/CollectionMerger.cpp b/k4FWCore/components/CollectionMerger.cpp index 59585686..5909100a 100644 --- a/k4FWCore/components/CollectionMerger.cpp +++ b/k4FWCore/components/CollectionMerger.cpp @@ -35,14 +35,6 @@ #include "edm4hep/edm4hep.h" -#include "edm4hep/MCRecoCaloAssociationCollection.h" -#include "edm4hep/MCRecoCaloParticleAssociationCollection.h" -#include "edm4hep/MCRecoClusterParticleAssociationCollection.h" -#include "edm4hep/MCRecoParticleAssociationCollection.h" -#include "edm4hep/MCRecoTrackParticleAssociationCollection.h" -#include "edm4hep/MCRecoTrackerAssociationCollection.h" -#include "edm4hep/RecoParticleVertexAssociationCollection.h" - #include "k4FWCore/Transformer.h" #include @@ -77,20 +69,20 @@ struct CollectionMerger final : k4FWCore::Transformer; m_map["edm4hep::ReconstructedParticleCollection"] = &CollectionMerger::mergeCollections; - m_map["edm4hep::MCRecoParticleAssociationCollection"] = - &CollectionMerger::mergeCollections; - m_map["edm4hep::MCRecoCaloAssociationCollection"] = - &CollectionMerger::mergeCollections; - m_map["edm4hep::MCRecoTrackerAssociationCollection"] = - &CollectionMerger::mergeCollections; - m_map["edm4hep::MCRecoCaloParticleAssociationCollection"] = - &CollectionMerger::mergeCollections; - m_map["edm4hep::MCRecoClusterParticleAssociationCollection"] = - &CollectionMerger::mergeCollections; - m_map["edm4hep::MCRecoTrackParticleAssociationCollection"] = - &CollectionMerger::mergeCollections; - m_map["edm4hep::RecoParticleVertexAssociationCollection"] = - &CollectionMerger::mergeCollections; + m_map["edm4hep::RecoMCParticleLinkCollection"] = + &CollectionMerger::mergeCollections; + m_map["edm4hep::CaloHitSimCaloHitLinkCollection"] = + &CollectionMerger::mergeCollections; + m_map["edm4hep::TrackerHitSimTrackerHitLinkCollection"] = + &CollectionMerger::mergeCollections; + m_map["edm4hep::CaloHitMCParticleLinkCollection"] = + &CollectionMerger::mergeCollections; + m_map["edm4hep::ClusterMCParticleLinkCollection"] = + &CollectionMerger::mergeCollections; + m_map["edm4hep::TrackMCParticleLinkCollection"] = + &CollectionMerger::mergeCollections; + m_map["edm4hep::VertexRecoParticleLinkCollection"] = + &CollectionMerger::mergeCollections; m_map["edm4hep::TimeSeriesCollection"] = &CollectionMerger::mergeCollections; m_map["edm4hep::RecDqdxCollection"] = &CollectionMerger::mergeCollections; m_map["edm4hep::GeneratorEventParametersCollection"] =