diff --git a/.gitignore b/.gitignore index 656d0058c..0b348d53b 100644 --- a/.gitignore +++ b/.gitignore @@ -235,8 +235,7 @@ spack-* install/ ## podio podio_generated_files.cmake -/include/podio/podioVersion.h -/python/podio/__init__.py + ## EDM4hep /python/edm4hep/__version__.py edm4hep/edm4hep/ diff --git a/test/hepmc/edm4hep_testhepmc.cc b/test/hepmc/edm4hep_testhepmc.cc index 7fba466e1..353a554fe 100644 --- a/test/hepmc/edm4hep_testhepmc.cc +++ b/test/hepmc/edm4hep_testhepmc.cc @@ -17,11 +17,7 @@ #include "HepPDT/ParticleID.hh" #include "podio/Frame.h" -#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99) #include "podio/ROOTWriter.h" -#else -#include "podio/ROOTFrameWriter.h" -#endif #include "edm4hep/MCParticleCollection.h" @@ -158,11 +154,7 @@ int main() { auto event = podio::Frame(); event.put(std::move(edm_particle_collection), "TestParticles2"); -#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99) auto writer = podio::ROOTWriter("edm4hep_testhepmc.root"); -#else - auto writer = podio::ROOTFrameWriter("edm4hep_testhepmc.root"); -#endif writer.writeFrame(event, "events"); // after all events diff --git a/test/read_events.cc b/test/read_events.cc index c7185e353..68b1cd82f 100644 --- a/test/read_events.cc +++ b/test/read_events.cc @@ -1,13 +1,5 @@ #include "read_events.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 int main() { read_events("edm4hep_events.root"); diff --git a/test/read_events.h b/test/read_events.h index ea805483c..4164bbc65 100644 --- a/test/read_events.h +++ b/test/read_events.h @@ -14,7 +14,6 @@ // podio specific includes #include "podio/Frame.h" -#include "podio/podioVersion.h" // STL #include @@ -273,11 +272,7 @@ void processEvent(const podio::Frame& event) { // throw std::runtime_error("Collection 'SimCalorimeterHitContributions' should be present"); // } -#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0) const auto evtType = event.getParameter("EventType").value(); -#else - const auto& evtType = event.getParameter("EventType"); -#endif std::cout << "Event Type: " << evtType << std::endl; } diff --git a/test/read_events_sio.cc b/test/read_events_sio.cc index 92fe0b5ea..8f012bfd2 100644 --- a/test/read_events_sio.cc +++ b/test/read_events_sio.cc @@ -1,14 +1,6 @@ #include "read_events.h" -#include "podio/podioVersion.h" -#if PODIO_BUILD_VERSION >= PODIO_VERSION(0, 99, 0) #include "podio/SIOReader.h" -#else -#include "podio/SIOFrameReader.h" -namespace podio { -using SIOReader = podio::SIOFrameReader; -} -#endif int main(int, char**) { read_events("edm4hep_events.sio"); diff --git a/test/write_events.cc b/test/write_events.cc index 7d9091561..7d7e7ae14 100644 --- a/test/write_events.cc +++ b/test/write_events.cc @@ -1,13 +1,5 @@ #include "write_events.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 int main(int, char*[]) { diff --git a/test/write_events_sio.cc b/test/write_events_sio.cc index 15454d5cc..406efe67d 100644 --- a/test/write_events_sio.cc +++ b/test/write_events_sio.cc @@ -1,14 +1,6 @@ #include "write_events.h" -#include "podio/podioVersion.h" -#if PODIO_BUILD_VERSION >= PODIO_VERSION(0, 99, 0) #include "podio/SIOWriter.h" -#else -#include "podio/SIOFrameWriter.h" -namespace podio { -using SIOWriter = podio::SIOFrameWriter; -} -#endif int main(int, char**) { write("edm4hep_events.sio"); diff --git a/tools/src/edm4hep2json.cxx b/tools/src/edm4hep2json.cxx index 379ad25c5..c6e1f1686 100644 --- a/tools/src/edm4hep2json.cxx +++ b/tools/src/edm4hep2json.cxx @@ -5,16 +5,8 @@ #include "TFile.h" // podio -#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/ROOTLegacyReader.h" +#include "podio/ROOTReader.h" // std #include diff --git a/utils/src/ParticleIDUtils.cc b/utils/src/ParticleIDUtils.cc index 15442c700..d4da00a36 100644 --- a/utils/src/ParticleIDUtils.cc +++ b/utils/src/ParticleIDUtils.cc @@ -5,7 +5,6 @@ #include "edm4hep/Constants.h" #include -#include #include #include @@ -141,7 +140,6 @@ void PIDHandler::setAlgoInfo(podio::Frame& metadata, const std::string& collName std::optional PIDHandler::getAlgoInfo(const podio::Frame& metadata, const std::string& collName) { -#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0) auto maybeAlgoName = metadata.getParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDAlgoName)); if (!maybeAlgoName.has_value()) { @@ -156,22 +154,6 @@ std::optional PIDHandler::getAlgoInfo(const podi podio::collMetadataParamName(collName, edm4hep::labels::PIDParameterNames)) .value()}; -#else - - const auto& algoName = - metadata.getParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDAlgoName)); - // Use the algoName as proxy to see whether we could actually get the - // information from the metadata - if (algoName.empty()) { - return std::nullopt; - } - - ParticleIDMeta pidInfo{ - algoName, metadata.getParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDAlgoType)), - metadata.getParameter>( - podio::collMetadataParamName(collName, edm4hep::labels::PIDParameterNames))}; -#endif - return pidInfo; }