diff --git a/k4FWCore/components/PodioOutput.h b/k4FWCore/components/PodioOutput.h index 510ef297..312fce21 100644 --- a/k4FWCore/components/PodioOutput.h +++ b/k4FWCore/components/PodioOutput.h @@ -22,15 +22,7 @@ #include "Gaudi/Algorithm.h" #include "k4FWCore/KeepDropSwitch.h" #include "podio/CollectionBase.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 diff --git a/k4FWCore/include/k4FWCore/MetaDataHandle.h b/k4FWCore/include/k4FWCore/MetaDataHandle.h index c3d55b09..ced03f49 100644 --- a/k4FWCore/include/k4FWCore/MetaDataHandle.h +++ b/k4FWCore/include/k4FWCore/MetaDataHandle.h @@ -21,8 +21,6 @@ #include "k4FWCore/PodioDataSvc.h" -#include "podio/podioVersion.h" - template class MetaDataHandle { public: MetaDataHandle(); @@ -92,19 +90,7 @@ MetaDataHandle::MetaDataHandle(const Gaudi::DataHandle& handle, const std::st //--------------------------------------------------------------------------- template std::optional MetaDataHandle::get_optional() const { const auto& frame = m_podio_data_service->getMetaDataFrame(); -#if PODIO_BUILD_VERSION > PODIO_VERSION(0, 99, 0) return frame.getParameter(fullDescriptor()); -#else - // explicitly make a copy here and move it into the optional below - auto val = frame.getParameter(fullDescriptor()); - // This is what happens if we have a non-present key, so we can use it as a - // way to determine if the parameter was (likely) unset. For more details see - // https://github.com/AIDASoft/podio/issues/576 - if (val == T{}) { - return std::nullopt; - } - return std::optional(std::move(val)); -#endif } //--------------------------------------------------------------------------- diff --git a/k4FWCore/include/k4FWCore/PodioDataSvc.h b/k4FWCore/include/k4FWCore/PodioDataSvc.h index 7ce04986..9084cc21 100644 --- a/k4FWCore/include/k4FWCore/PodioDataSvc.h +++ b/k4FWCore/include/k4FWCore/PodioDataSvc.h @@ -26,15 +26,7 @@ #include "podio/CollectionBase.h" #include "podio/CollectionIDTable.h" #include "podio/Frame.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 // Forward declarations #include "k4FWCore/DataWrapper.h" class DataWrapperBase;