From 070b025abc06ff4bd7d78451298708ab9f6fd682 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Fri, 30 Oct 2015 22:31:29 +0000
Subject: [PATCH] - modified LCIOFileReader to use sequential reading mode
as using direct access always requires runNum==0 and sequential evt nums ...
---
CMakeLists.txt | 8 ++++----
DDG4/lcio/LCIOEventReader.cpp | 1 +
DDG4/lcio/LCIOEventReader.h | 1 +
DDG4/lcio/LCIOFileReader.cpp | 23 +++++++++++++++++++----
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d3b529a6..efb4de1c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,10 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
#---Options-------------------------------------------------------------------------
option(DD4HEP_USE_XERCESC "Enable 'Detector Builders' based on XercesC" OFF)
-option(DD4HEP_USE_PYROOT "Enable 'Detector Builders' based on PyROOT" OFF) # does not work (compile error)
-option(DD4HEP_USE_GEANT4 "Enable the simulation part based on Geant4" OFF)
-option(DD4HEP_USE_GEAR "Build gear wrapper for backward compatibility" OFF)
-option(DD4HEP_USE_LCIO "Build lcio extensions" OFF)
+option(DD4HEP_USE_PYROOT "Enable 'Detector Builders' based on PyROOT" ON ) # does not work (compile error)
+option(DD4HEP_USE_GEANT4 "Enable the simulation part based on Geant4" ON )
+option(DD4HEP_USE_GEAR "Build gear wrapper for backward compatibility" ON )
+option(DD4HEP_USE_LCIO "Build lcio extensions" ON )
option(BUILD_TESTING "Enable and build tests" ON)
option(DD4HEP_USE_CXX11 "Build DD4hep using c++11" OFF)
#
diff --git a/DDG4/lcio/LCIOEventReader.cpp b/DDG4/lcio/LCIOEventReader.cpp
index df551e800..5d3c0e55c 100644
--- a/DDG4/lcio/LCIOEventReader.cpp
+++ b/DDG4/lcio/LCIOEventReader.cpp
@@ -57,6 +57,7 @@ LCIOEventReader::LCIOEventReader(const string& nam)
LCIOEventReader::~LCIOEventReader() {
}
+
/// Read an event and fill a vector of MCParticles.
LCIOEventReader::EventReaderStatus
LCIOEventReader::readParticles(int event_number, vector<Particle*>& particles) {
diff --git a/DDG4/lcio/LCIOEventReader.h b/DDG4/lcio/LCIOEventReader.h
index 03bc1e0bf..31dbccb8e 100644
--- a/DDG4/lcio/LCIOEventReader.h
+++ b/DDG4/lcio/LCIOEventReader.h
@@ -42,6 +42,7 @@ namespace DD4hep {
LCIOEventReader(const std::string& nam);
/// Default destructor
virtual ~LCIOEventReader();
+
/// Read an event and fill a vector of MCParticles.
virtual EventReaderStatus readParticles(int event_number, std::vector<Particle*>& particles);
/// Read an event and return a LCCollectionVec of MCParticles.
diff --git a/DDG4/lcio/LCIOFileReader.cpp b/DDG4/lcio/LCIOFileReader.cpp
index b98153608..f649b31b8 100644
--- a/DDG4/lcio/LCIOFileReader.cpp
+++ b/DDG4/lcio/LCIOFileReader.cpp
@@ -40,11 +40,13 @@ namespace DD4hep {
protected:
/// Reference to reader object
IO::LCReader* m_reader;
+ unsigned m_nEvt ;
public:
/// Initializing constructor
LCIOFileReader(const std::string& nam);
/// Default destructor
virtual ~LCIOFileReader();
+
/// Read an event and fill a vector of MCParticles.
virtual EventReaderStatus readParticleCollection(int event_number, EVENT::LCCollection** particles);
};
@@ -63,12 +65,12 @@ DECLARE_GEANT4_EVENT_READER_NS(DD4hep::Simulation,LCIOFileReader)
/// Initializing constructor
DD4hep::Simulation::LCIOFileReader::LCIOFileReader(const std::string& nam)
-: LCIOEventReader(nam)
+: LCIOEventReader(nam), m_nEvt(0)
{
m_reader = ::lcio::LCFactory::getInstance()->createLCReader(LCReader::directAccess);
printout(INFO,"LCIOFileReader","Created file reader. Try to open input %s",nam.c_str());
m_reader->open(nam);
- m_directAccess = true;
+ m_directAccess = false;
}
/// Default destructor
@@ -79,10 +81,23 @@ DD4hep::Simulation::LCIOFileReader::~LCIOFileReader() {
/// Read an event and fill a vector of MCParticles.
Geant4EventReader::EventReaderStatus
DD4hep::Simulation::LCIOFileReader::readParticleCollection(int event_number, EVENT::LCCollection** particles) {
- ::lcio::LCEvent* evt = m_reader->readEvent(/*runNumber*/ 0, event_number);
+
+ // ::lcio::LCEvent* evt = m_reader->readEvent(/*runNumber*/ 0, event_number);
+ // fg: direct access does not work if run number is different from 0 and/or event numbers are not stored consequutively
+ if( m_nEvt == 0 && event_number != 0 ) {
+ m_reader->skipNEvents( event_number ) ;
+ printout(INFO,"LCIOFileReader","Skipping the first %d events ", event_number );
+ }
+
+ ::lcio::LCEvent* evt = m_reader->readNextEvent(); // simply read the events sequentially
+ ++m_nEvt ;
+
if ( evt ) {
*particles = evt->getCollection(LCIO::MCPARTICLE);
- if ( *particles ) return EVENT_READER_OK;
+ if ( *particles ) {
+ printout(INFO,"LCIOFileReader","read collection %s from event %d in run %d ", LCIO::MCPARTICLE, evt->getEventNumber() , evt->getRunNumber() );
+ return EVENT_READER_OK;
+ }
}
return EVENT_READER_ERROR;
}
--
GitLab