JEventSourcePODIO: support future ROOTFrameReader -> ROOTReader rename

eic · Nov 14, 2024 · 810447a · 810447a
1 parent 7949889
commit 810447a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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<JEvent> 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
@@ -8,7 +8,12 @@
 #include <JANA/JEvent.h>
 #include <JANA/JEventSource.h>
 #include <JANA/JEventSourceGeneratorT.h>
+#include <podio/podioVersion.h>
+#if podio_VERSION >= PODIO_VERSION(0, 99, 0)
+#include <podio/ROOTReader.h>
+#else
 #include <podio/ROOTFrameReader.h>
+#endif
 #include <stddef.h>
 #include <memory>
 #include <set>
@@ -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;