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

Change ROOTFrame{Writer,Reader} to ROOT{Writer,Reader} #1221

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Change ROOTFrame{Writer,Reader} to ROOT{Writer,Reader} #1221

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
8 changes: 8 additions & 0 deletions DDDigi/io/DigiEdm4hepInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@

// podio/edm4hep include files
#include <podio/Frame.h>
#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99)
#include <podio/ROOTReader.h>
#else
#include <podio/ROOTFrameReader.h>
#endif

#include <edm4hep/SimTrackerHit.h>
#include <edm4hep/SimCalorimeterHit.h>
Expand Down Expand Up @@ -47,7 +51,11 @@ namespace dd4hep {
const podio::CollectionBase* get(const std::string& nam) const { return frame.get(nam); }
};

#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99)
using reader_t = podio::ROOTReader;
#else
using reader_t = podio::ROOTFrameReader;
#endif
using frame_t = edm4hep_read_frame_t;

/// EDM4HEP Digi input reader: Collection descriptor definition
Expand Down
12 changes: 12 additions & 0 deletions DDDigi/io/DigiEdm4hepOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@

/// edm4hep include files
#include <podio/CollectionBase.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 <podio/Frame.h>
#include <edm4hep/SimTrackerHit.h>
#include <edm4hep/MCParticleCollection.h>
Expand Down Expand Up @@ -50,7 +54,11 @@ namespace dd4hep {
using headercollection_t = std::pair<std::string,std::unique_ptr<edm4hep::EventHeaderCollection> >;
DigiEdm4hepOutput* m_parent { nullptr };
/// Reference to podio writer
#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99)
std::unique_ptr<podio::ROOTWriter> m_writer { };
#else
std::unique_ptr<podio::ROOTFrameWriter> m_writer { };
#endif
/// edm4hep event header collection
headercollection_t m_header { };
/// MC particle collection
Expand Down Expand Up @@ -190,7 +198,11 @@ namespace dd4hep {
clear();
m_writer.reset();
std::string fname = m_parent->next_stream_name();
#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99)
m_writer = std::make_unique<podio::ROOTWriter>(fname);
#else
m_writer = std::make_unique<podio::ROOTFrameWriter>(fname);
#endif
m_parent->info("+++ Opened EDM4HEP output file %s", fname.c_str());
}

Expand Down
12 changes: 12 additions & 0 deletions DDG4/edm4hep/Geant4Output2EDM4hep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@
#include <edm4hep/EDM4hepVersion.h>
/// podio include files
#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 <podio/podioVersion.h>

/// Namespace for the AIDA detector description toolkit
Expand All @@ -48,7 +52,11 @@ namespace dd4hep {
*/
class Geant4Output2EDM4hep : public Geant4OutputAction {
protected:
#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99)
using writer_t = podio::ROOTWriter;
#else
using writer_t = podio::ROOTFrameWriter;
#endif
using stringmap_t = std::map< std::string, std::string >;
using trackermap_t = std::map< std::string, edm4hep::SimTrackerHitCollection >;
using calorimeterpair_t = std::pair< edm4hep::SimCalorimeterHitCollection, edm4hep::CaloHitContributionCollection >;
Expand Down Expand Up @@ -238,7 +246,11 @@ void Geant4Output2EDM4hep::beginRun(const G4Run* run) {
}
}
if ( !fname.empty() ) {
#if PODIO_VERSION_MAJOR > 0 || (PODIO_VERSION_MAJOR == 0 && PODIO_VERSION_MINOR >= 99)
m_file = std::make_unique<podio::ROOTWriter>(fname);
#else
m_file = std::make_unique<podio::ROOTFrameWriter>(fname);
#endif
if ( !m_file ) {
fatal("+++ Failed to open output file: %s", fname.c_str());
}
Expand Down
Loading