Delete the version checks for Podio before 1.0

key4hep · Aug 10, 2024 · 69b1323 · 69b1323
1 parent 526f542
commit 69b1323
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 51 deletions.
diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
@@ -37,7 +37,6 @@ using TrackerHit3D = edm4hep::TrackerHit;
 #include <edm4hep/utils/ParticleIDUtils.h>
 
 #include "podio/Frame.h"
-#include "podio/podioVersion.h"
 
 // LCIO
 #include <IMPL/CalorimeterHitImpl.h>
@@ -76,11 +75,7 @@ using ObjectMapT = k4EDM4hep2LcioConv::VecMapT<T1, T2>;
 template <typename T1, typename T2>
 using vec_pair [[deprecated("Use a more descriptive alias")]] = ObjectMapT<T1, T2>;
 
-#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0)
 using CellIDStrType = const std::optional<std::string>;
-#else
-using CellIDStrType = const std::string;
-#endif
 
 struct CollectionsPairVectors {
   ObjectMapT<lcio::TrackImpl*, edm4hep::Track> tracks{};

diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.ipp b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.ipp
@@ -77,15 +77,9 @@ std::unique_ptr<lcio::LCCollectionVec> convertTrackerHits(const edm4hep::Tracker
                                                           TrackerHitMapT& trackerHitMap) {
   auto trackerhits = std::make_unique<lcio::LCCollectionVec>(lcio::LCIO::TRACKERHIT);
 
-#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0)
   if (cellIDstr.has_value()) {
     lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr.value(), trackerhits.get());
   }
-#else
-  if (!cellIDstr.empty()) {
-    lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr, trackerhits.get());
-  }
-#endif
 
   // Loop over EDM4hep trackerhits converting them to lcio trackerhits
   for (const auto& edm_trh : (*edmColection)) {
@@ -122,15 +116,9 @@ convertTrackerHitPlanes(const edm4hep::TrackerHitPlaneCollection* const edmColle
                         TrackerHitPlaneMapT& trackerHitsMap) {
   auto trackerHitPlanes = std::make_unique<lcio::LCCollectionVec>(lcio::LCIO::TRACKERHITPLANE);
 
-#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0)
   if (cellIDstr.has_value()) {
     lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr.value(), trackerHitPlanes.get());
   }
-#else
-  if (!cellIDstr.empty()) {
-    lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr, trackerHitPlanes.get());
-  }
-#endif
 
   for (const auto& edm_trh : (*edmCollection)) {
     if (edm_trh.isAvailable()) {
@@ -172,15 +160,9 @@ convertSimTrackerHits(const edm4hep::SimTrackerHitCollection* const edmCollectio
                       SimTrHitMapT& simTrHitMap) {
   auto simtrackerhits = std::make_unique<lcio::LCCollectionVec>(lcio::LCIO::SIMTRACKERHIT);
 
-#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0)
   if (cellIDstr.has_value()) {
     lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr.value(), simtrackerhits.get());
   }
-#else
-  if (!cellIDstr.empty()) {
-    lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr, simtrackerhits.get());
-  }
-#endif
 
   // Loop over EDM4hep simtrackerhits converting them to LCIO simtrackerhits
   for (const auto& edm_strh : (*edmCollection)) {
@@ -222,15 +204,9 @@ convertCalorimeterHits(const edm4hep::CalorimeterHitCollection* const edmCollect
                        CaloHitMapT& caloHitMap) {
   auto calohits = std::make_unique<lcio::LCCollectionVec>(lcio::LCIO::CALORIMETERHIT);
 
-#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0)
   if (cellIDstr.has_value()) {
     lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr.value(), calohits.get());
   }
-#else
-  if (!cellIDstr.empty()) {
-    lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr, calohits.get());
-  }
-#endif
 
   for (const auto& edm_calohit : (*edmCollection)) {
     if (edm_calohit.isAvailable()) {
@@ -296,15 +272,9 @@ convertSimCalorimeterHits(const edm4hep::SimCalorimeterHitCollection* const edmC
                           const CellIDStrType& cellIDstr, SimCaloHitMapT& simCaloHitMap) {
   auto simcalohits = std::make_unique<lcio::LCCollectionVec>(lcio::LCIO::SIMCALORIMETERHIT);
 
-#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0)
   if (cellIDstr.has_value()) {
     lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr.value(), simcalohits.get());
   }
-#else
-  if (!cellIDstr.empty()) {
-    lcio::CellIDEncoder<lcio::SimCalorimeterHitImpl> idEnc(cellIDstr, simcalohits.get());
-  }
-#endif
 
   for (const auto& edm_sim_calohit : (*edmCollection)) {
     if (edm_sim_calohit.isAvailable()) {

diff --git a/standalone/lcio2edm4hep.cpp b/standalone/lcio2edm4hep.cpp
@@ -6,15 +6,7 @@
 
 #include <edm4hep/utils/ParticleIDUtils.h>
 
-#include "podio/podioVersion.h"
-#if PODIO_BUILD_VERSION >= PODIO_VERSION(0, 99, 0)
 #include "podio/ROOTWriter.h"
-#else
-#include "podio/ROOTFrameWriter.h"
-namespace podio {
-using ROOTWriter = podio::ROOTFrameWriter;
-}
-#endif
 
 #include <cstdlib>
 #include <fstream>

diff --git a/tests/compare_contents.cpp b/tests/compare_contents.cpp
@@ -1,15 +1,7 @@
 #include "CompareEDM4hepLCIO.h"
 #include "ObjectMapping.h"
 
-#include "podio/podioVersion.h"
-#if PODIO_BUILD_VERSION >= PODIO_VERSION(0, 99, 0)
 #include "podio/ROOTReader.h"
-#else
-#include "podio/ROOTFrameReader.h"
-namespace podio {
-using ROOTReader = podio::ROOTFrameReader;
-}
-#endif
 
 #include "podio/Frame.h"