From 810447a905cd09921412c49623f6f7f9788443ec Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 13 Nov 2024 22:58:15 -0500 Subject: [PATCH] JEventSourcePODIO: support future ROOTFrameReader -> ROOTReader rename --- src/services/io/podio/JEventSourcePODIO.cc | 4 ++-- src/services/io/podio/JEventSourcePODIO.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/services/io/podio/JEventSourcePODIO.cc b/src/services/io/podio/JEventSourcePODIO.cc index 1d60140ff2..d7260b768d 100644 --- a/src/services/io/podio/JEventSourcePODIO.cc +++ b/src/services/io/podio/JEventSourcePODIO.cc @@ -174,7 +174,7 @@ void JEventSourcePODIO::Open() { //------------------------------------------------------------------------------ void JEventSourcePODIO::Close() { // m_reader.close(); - // TODO: ROOTFrameReader does not appear to have a close() method. + // TODO: ROOTReader does not appear to have a close() method. } @@ -196,7 +196,7 @@ void JEventSourcePODIO::GetEvent(std::shared_ptr event) { Nevents_read = 0; }else{ // m_reader.close(); - // TODO:: ROOTFrameReader does not appear to have a close() method. + // TODO:: ROOTReader does not appear to have a close() method. throw RETURN_STATUS::kNO_MORE_EVENTS; } } diff --git a/src/services/io/podio/JEventSourcePODIO.h b/src/services/io/podio/JEventSourcePODIO.h index 21dc45c999..ba7c45a94d 100644 --- a/src/services/io/podio/JEventSourcePODIO.h +++ b/src/services/io/podio/JEventSourcePODIO.h @@ -8,7 +8,12 @@ #include #include #include +#include +#if podio_VERSION >= PODIO_VERSION(0, 99, 0) +#include +#else #include +#endif #include #include #include @@ -32,7 +37,12 @@ class JEventSourcePODIO : public JEventSource { void PrintCollectionTypeTable(void); protected: +#if podio_VERSION >= PODIO_VERSION(0, 99, 0) + podio::ROOTReader m_reader; +#else podio::ROOTFrameReader m_reader; +#endif + size_t Nevents_in_file = 0; size_t Nevents_read = 0;