From ab97e02974163b7c7a4802c3ff6a9abcc00e3fc9 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Thu, 7 Jan 2016 16:02:39 +0000
Subject: [PATCH] Clearer status message in moveToEvent functions, change
verbosity for particle printout in HepMC, add comment
---
DDG4/lcio/LCIOFileReader.cpp | 4 +++-
DDG4/lcio/LCIOStdHepReader.cpp | 3 ++-
DDG4/plugins/Geant4EventReaderHepMC.cpp | 5 +++--
DDG4/src/Geant4InputAction.cpp | 1 +
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/DDG4/lcio/LCIOFileReader.cpp b/DDG4/lcio/LCIOFileReader.cpp
index 0e8196b3e..eb50d05ab 100644
--- a/DDG4/lcio/LCIOFileReader.cpp
+++ b/DDG4/lcio/LCIOFileReader.cpp
@@ -87,8 +87,10 @@ DD4hep::Simulation::LCIOFileReader::moveToEvent(int event_number) {
// fg: direct access does not work if run number is different from 0 and/or event numbers are not stored consecutively
if( m_currEvent == 0 && event_number != 0 ) {
m_reader->skipNEvents( event_number ) ;
- printout(INFO,"LCIOFileReader","Skipping the first %d events ", event_number );
+ printout(INFO,"LCIOFileReader::moveToEvent","Skipping the first %d events ", event_number );
+ printout(INFO,"LCIOFileReader::moveToEvent","Event number before skipping: %d", m_currEvent );
m_currEvent = event_number;
+ printout(INFO,"LCIOFileReader::moveToEvent","Event number after skipping: %d", m_currEvent );
}
return EVENT_READER_OK;
}
diff --git a/DDG4/lcio/LCIOStdHepReader.cpp b/DDG4/lcio/LCIOStdHepReader.cpp
index 82e357a9d..1a04cd382 100644
--- a/DDG4/lcio/LCIOStdHepReader.cpp
+++ b/DDG4/lcio/LCIOStdHepReader.cpp
@@ -91,13 +91,14 @@ Geant4EventReader::EventReaderStatus
LCIOStdHepReader::moveToEvent(int event_number) {
if( m_currEvent == 0 && event_number != 0 ) {
printout(INFO,"LCIOStdHepReader::moveToEvent","Skipping the first %d events ", event_number );
- printout(INFO,"LCIOStdHepReader::moveToEvent","Current Event Number: %d", m_currEvent );
+ printout(INFO,"LCIOStdHepReader::moveToEvent","Event number before skipping: %d", m_currEvent );
while ( m_currEvent < event_number ) {
EVENT::LCCollection* particles = m_reader->readEvent();
if ( 0 == particles ) return EVENT_READER_ERROR;
++m_currEvent;
}
}
+ printout(INFO,"LCIOStdHepReader::moveToEvent","Event number after skipping: %d", m_currEvent );
return EVENT_READER_OK;
}
diff --git a/DDG4/plugins/Geant4EventReaderHepMC.cpp b/DDG4/plugins/Geant4EventReaderHepMC.cpp
index 43c235e77..012423c88 100644
--- a/DDG4/plugins/Geant4EventReaderHepMC.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepMC.cpp
@@ -189,12 +189,13 @@ Geant4EventReader::EventReaderStatus
Geant4EventReaderHepMC::moveToEvent(int event_number) {
if( m_currEvent == 0 && event_number != 0 ) {
printout(INFO,"EventReaderHepMC::moveToEvent","Skipping the first %d events ", event_number );
- printout(INFO,"EventReaderHepMC::moveToEvent","Current Event Number: %d", m_currEvent );
+ printout(INFO,"EventReaderHepMC::moveToEvent","Event number before skipping: %d", m_currEvent );
while ( m_currEvent < event_number ) {
if ( not m_events->read() ) return EVENT_READER_ERROR;
++m_currEvent;
}
}
+ printout(INFO,"EventReaderHepMC::moveToEvent","Event number after skipping: %d", m_currEvent );
return EVENT_READER_OK;
}
@@ -211,7 +212,7 @@ Geant4EventReaderHepMC::readParticles(int /* ev_id */, Particles& output) {
m_events->clear();
for(Particles::const_iterator k=output.begin(); k != output.end(); ++k) {
Geant4ParticleHandle p(*k);
- printout(INFO,m_name,
+ printout(VERBOSE,m_name,
"+++ %s ID:%3d status:%08X typ:%9d Mom:(%+.2e,%+.2e,%+.2e)[MeV] "
"time: %+.2e [ns] #Dau:%3d #Par:%1d",
"",p->id,p->status,p->pdgID,
diff --git a/DDG4/src/Geant4InputAction.cpp b/DDG4/src/Geant4InputAction.cpp
index ed699f350..f16c734cd 100644
--- a/DDG4/src/Geant4InputAction.cpp
+++ b/DDG4/src/Geant4InputAction.cpp
@@ -54,6 +54,7 @@ Geant4EventReader::moveToEvent(int event_number) {
if ( event_number >= INT_MIN ) {
return EVENT_READER_OK; // Logic below does not work as expected.
} // This shortcuts it!
+ // APS: would have been nice to know what exactly doesn't work...
if ( m_currEvent == event_number ) {
return EVENT_READER_OK;
}
--
GitLab