diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h index d6ad3a0..1520435 100644 --- a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h +++ b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h @@ -72,9 +72,6 @@ namespace EDM4hep2LCIOConv { template using ObjectMapT = k4EDM4hep2LcioConv::VecMapT; -template -using vec_pair [[deprecated("Use a more descriptive alias")]] = ObjectMapT; - using CellIDStrType = const std::optional; struct CollectionsPairVectors { @@ -144,12 +141,6 @@ template std::unique_ptr convertTracks(const edm4hep::TrackCollection* const edmCollection, TrackMapT& trackMap); -template -[[deprecated("Use convertTracks instead")]] lcio::LCCollectionVec* -convTracks(const edm4hep::TrackCollection* const tracks_coll, TrackMapT& tracks_vec, const TrackerHitMapT&) { - return convertTracks(tracks_coll, tracks_vec).release(); -} - /** * Convert EDM4hep TrackerHits to LCIO. Simultaneously populate mapping from * EDM4hep to LCIO objects for relation resolving in a second step. @@ -159,13 +150,6 @@ std::unique_ptr convertTrackerHits(const edm4hep::Tracker const CellIDStrType& cellIDStr, TrackerHitMapT& trackerHitMap); -template -[[deprecated("Use convertTrackerHits instead")]] lcio::LCCollectionVec* -convTrackerHits(const edm4hep::TrackerHit3DCollection* const trackerhits_coll, const CellIDStrType& cellIDstr, - TrackerHitMapT& trackerhits_vec) { - return convertTrackerHits(trackerhits_coll, cellIDstr, trackerhits_vec).release(); -} - /** * Convert EDM4hep TrackerHitPlanes to LCIO. Simultaneously populate mapping * from EDM4hep to LCIO objects for relation resolving in a second step. @@ -175,13 +159,6 @@ std::unique_ptr convertTrackerHitPlanes(const edm4hep::TrackerHitPlaneCollection* const edmCollection, const CellIDStrType& cellIDstr, TrackerHitPlaneMapT& trackerHitsMap); -template -[[deprecated("Use convertTrackerHitPlanes instead")]] lcio::LCCollectionVec* -convTrackerHitPlanes(const edm4hep::TrackerHitPlaneCollection* const trackerhits_coll, const CellIDStrType& cellIDstr, - TrackerHitPlaneMapT& trackerhits_vec) { - return convertTrackerHitPlanes(trackerhits_coll, cellIDstr, trackerhits_vec).release(); -} - /** * Convert EDM4hep SimTrackerHits to LCIO. Simultaneously populate mapping * from EDM4hep to LCIO objects for relation resolving in a second step. @@ -191,13 +168,6 @@ std::unique_ptr convertSimTrackerHits(const edm4hep::SimTrackerHitCollection* const edmCollection, const CellIDStrType& cellIDstr, SimTrHitMapT& simTrHitMap); -template -[[deprecated("Use convertSimTrackerHits instead")]] lcio::LCCollectionVec* -convSimTrackerHits(const edm4hep::SimTrackerHitCollection* const simtrackerhits_coll, const CellIDStrType& cellIDstr, - SimTrHitMapT& simtrackerhits_vec, const MCParticleMapT&) { - return convertSimTrackerHits(simtrackerhits_coll, cellIDstr, simtrackerhits_vec).release(); -} - /** * Convert EDM4hep CalorimeterHits to LCIO. Simultaneously populate mapping * from EDM4hep to LCIO objects for relation resolving in a second step. @@ -207,13 +177,6 @@ std::unique_ptr convertCalorimeterHits(const edm4hep::CalorimeterHitCollection* const edmCollection, const CellIDStrType& cellIDstr, CaloHitMapT& caloHitMap); -template -[[deprecated("Use convertCalorimeterHits instead")]] lcio::LCCollectionVec* -convCalorimeterHits(const edm4hep::CalorimeterHitCollection* const calohit_coll, const CellIDStrType& cellIDstr, - CaloHitMapT& calo_hits_vec) { - return convertCalorimeterHits(calohit_coll, cellIDstr, calo_hits_vec).release(); -} - /** * Convert EDM4hep RawCalorimeterHits to LCIO. Simultaneously populate mapping * from EDM4hep to LCIO objects for relation resolving in a second step. @@ -223,13 +186,6 @@ std::unique_ptr convertRawCalorimeterHits(const edm4hep::RawCalorimeterHitCollection* const edmCollection, RawCaloHitMapT& rawCaloHitMap); -template -[[deprecated("use convertRawCalorimeterHits instead")]] lcio::LCCollectionVec* -convRawCalorimeterHits(const edm4hep::RawCalorimeterHitCollection* const rawcalohit_coll, - RawCaloHitMapT& raw_calo_hits_vec) { - return convertRawCalorimeterHits(rawcalohit_coll, raw_calo_hits_vec).release(); -} - /** * Convert EDM4hep SimCalorimeterHits to LCIO. Simultaneously populate mapping * from EDM4hep to LCIO objects for relation resolving in a second step. @@ -239,19 +195,6 @@ std::unique_ptr convertSimCalorimeterHits(const edm4hep::SimCalorimeterHitCollection* const edmCollection, const CellIDStrType& cellIDstr, SimCaloHitMapT& simCaloHitMap); -template -lcio::LCCollectionVec* convSimCalorimeterHits(const edm4hep::SimCalorimeterHitCollection* const simcalohit_coll, - const CellIDStrType& cellIDstr, SimCaloHitMapT& sim_calo_hits_vec) { - return convertSimCalorimeterHits(simcalohit_coll, cellIDstr, sim_calo_hits_vec).release(); -} - -template -[[deprecated("remove MCParticleMap argument since it is unused")]] lcio::LCCollectionVec* -convSimCalorimeterHits(const edm4hep::SimCalorimeterHitCollection* const simcalohit_coll, - const CellIDStrType& cellIDstr, SimCaloHitMapT& sim_calo_hits_vec, const MCParticleMapT&) { - return convSimCalorimeterHits(simcalohit_coll, cellIDstr, sim_calo_hits_vec); -} - /** * Convert EDM4hep TPC Hits to LCIO. Simultaneously populate mapping from * EDM4hep to LCIO objects for relation resolving in a second step. @@ -260,12 +203,6 @@ template std::unique_ptr convertTPCHits(const edm4hep::RawTimeSeriesCollection* const edmCollection, TPCHitMapT& tpcHitMap); -template -[[deprecated("Use convertTPCHits instead")]] lcio::LCCollectionVec* -convTPCHits(const edm4hep::RawTimeSeriesCollection* const tpchit_coll, TPCHitMapT& tpc_hits_vec) { - return convertTPCHits(tpchit_coll, tpc_hits_vec).release(); -} - /** * Convert EDM4hep Clusters to LCIO. Simultaneously populate mapping from * EDM4hep to LCIO objects for relation resolving in a second step. @@ -274,18 +211,6 @@ template std::unique_ptr convertClusters(const edm4hep::ClusterCollection* const edmCollection, ClusterMapT& clusterMap); -template -[[deprecated("Use convertClusters instead")]] lcio::LCCollectionVec* -convClusters(const edm4hep::ClusterCollection* const cluster_coll, ClusterMapT& cluster_vec) { - return convertClusters(cluster_coll, cluster_vec).release(); -} - -template -[[deprecated("remove CaloHitMap argument since it is unused")]] lcio::LCCollectionVec* -convClusters(const edm4hep::ClusterCollection* const cluster_coll, ClusterMapT& cluster_vec, const CaloHitMapT&) { - return convClusters(cluster_coll, cluster_vec); -} - /** * Convert EDM4hep Vertices to LCIO. Simultaneously populate mapping from * EDM4hep to LCIO objects for relation resolving in a second step. @@ -294,12 +219,6 @@ template std::unique_ptr convertVertices(const edm4hep::VertexCollection* const edmCollection, VertexMapT& vertexMap); -template -[[deprecated("Use convertVertices instead")]] lcio::LCCollectionVec* -convVertices(const edm4hep::VertexCollection* const vertex_coll, VertexMapT& vertex_vec, const RecoPartMapT&) { - return convertVertices(vertex_coll, vertex_vec).release(); -} - /** * Convert EDM4hep ReconstructedParticles to LCIO. Simultaneously populate * mapping from EDM4hep to LCIO objects for relation resolving in a second @@ -310,13 +229,6 @@ std::unique_ptr convertReconstructedParticles(const edm4hep::ReconstructedParticleCollection* const edmCollection, RecoParticleMapT& recoParticleMap); -template -[[deprecated("Use convertReconstructedParticle instead")]] lcio::LCCollectionVec* -convReconstructedParticles(const edm4hep::ReconstructedParticleCollection* const recos_coll, - RecoPartMapT& recoparticles_vec, const TrackMapT&, const VertexMapT&, const ClusterMapT&) { - return convertReconstructedParticles(recos_coll, recoparticles_vec).release(); -} - /** * Convert EDM4hep MCParticles to LCIO. Simultaneously populate mapping from * EDM4hep to LCIO objects for relation resolving in a second step. @@ -325,12 +237,6 @@ template std::unique_ptr convertMCParticles(const edm4hep::MCParticleCollection* const edmCollection, MCPartMapT& mcParticleMap); -template -[[deprecated("Use convertMCParticles")]] lcio::LCCollectionVec* -convMCParticles(const edm4hep::MCParticleCollection* const mcparticle_coll, MCPartMapT& mc_particles_vec) { - return convertMCParticles(mcparticle_coll, mc_particles_vec).release(); -} - /** * Convert EDM4hep ParticleIDs to LCIO. NOTE: Since ParticleIDs cannot live in * their own collections in LCIO this simply populates the pidMap that maps @@ -347,9 +253,6 @@ void convertParticleIDs(const edm4hep::ParticleIDCollection* const edmCollection */ void convertEventHeader(const edm4hep::EventHeaderCollection* const header_coll, lcio::LCEventImpl* const lcio_event); -[[deprecated("Use convertEventheader instead")]] void -convEventHeader(const edm4hep::EventHeaderCollection* const header_coll, lcio::LCEventImpl* const lcio_event); - /** * Resolve the relations for MCParticles */ @@ -443,17 +346,6 @@ template std::unique_ptr createLCRelationCollection(const AssocCollT& associations, const FromMapT& fromMap, const ToMapT& toMap); -template -[[deprecated("Use resolveRelations instead")]] void FillMissingCollections(ObjectMappingT& update_pairs) { - resolveRelations(update_pairs); -} - -template -[[deprecated("Use resolveRelations instead")]] void FillMissingCollections(ObjectMappingT& update_pairs, - const ObjectMappingU& lookup_pairs) { - resolveRelations(update_pairs, lookup_pairs); -} - bool collectionExist(const std::string& collection_name, const lcio::LCEventImpl* lcio_event); /** @@ -462,11 +354,6 @@ bool collectionExist(const std::string& collection_name, const lcio::LCEventImpl std::unique_ptr convertEvent(const podio::Frame& edmEvent, const podio::Frame& metadata = podio::Frame{}); -[[deprecated("Use convertEvent")]] std::unique_ptr -convEvent(const podio::Frame& edmEvent, const podio::Frame& metadata = podio::Frame{}) { - return convertEvent(edmEvent, metadata); -} - /** * Get the radius of the TrackState at the first from the given track. This is * used to set the radiusOfInnermostHit in the LCIO track during the conversion