Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JEventSourcePODIO: support future ROOTFrameReader -> ROOTReader rename #1671

Merged
merged 1 commit into from
Nov 15, 2024
Merged

JEventSourcePODIO: support future ROOTFrameReader -> ROOTReader rename #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/services/io/podio/JEventSourcePODIO.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}


Expand All @@ -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;
}
}
Expand Down
10 changes: 10 additions & 0 deletions src/services/io/podio/JEventSourcePODIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;

Expand Down
Loading