diff --git a/DDG4/include/DDG4/Geant4Particle.h b/DDG4/include/DDG4/Geant4Particle.h index 77bfc55866e4bb69403491cb652c65a1bd9d0bba..bb4e2b12db38c26e9fea027067cb5a3eeeb1801e 100644 --- a/DDG4/include/DDG4/Geant4Particle.h +++ b/DDG4/include/DDG4/Geant4Particle.h @@ -221,11 +221,13 @@ namespace dd4hep { std::string processName() const; /// Access to the creator process type name std::string processTypeName() const; - /// Access patricle momentum, energy as 4 vector + /// Access particle momentum, energy as 4 vector FourVector pxPyPzM() const; - /// Access patricle momentum, energy as 4 vector + /// Access particle momentum, energy as 4 vector + template <typename T> std::vector<T> pxPyPzM(T unit) const; + /// Access particle momentum, energy as 4 vector ThreeVector startVertex() const; - /// Access patricle momentum, energy as 4 vector + /// Access particle momentum, energy as 4 vector ThreeVector endVertex() const; /// Access the Geant4 particle definition object (expensive!) const G4ParticleDefinition *definition() const; diff --git a/DDG4/python/DDSim/Helper/Meta.py b/DDG4/python/DDSim/Helper/Meta.py index c7db1cd59408b5404a2df5d1723c31ee31cd0e66..6b86ce1b3ddb2125675035e72e162677699bd336 100644 --- a/DDG4/python/DDSim/Helper/Meta.py +++ b/DDG4/python/DDSim/Helper/Meta.py @@ -31,7 +31,7 @@ class Meta(ConfigHelper): def parseEventParameters(self): """ - Parse the event parameters and return 3 event parameter dictionnaries, respectively + Parse the event parameters and return 3 event parameter dictionaries, respectively for string, int and float parameters """ stringParameters, intParameters, floatParameters, allParameters = {}, {}, {}, [] diff --git a/DDG4/src/Geant4Action.cpp b/DDG4/src/Geant4Action.cpp index f0f053ad23054d7de87d4e8cafc015ecc888f615..9de0f0f17bfebf6c6c7272682d5c4d2339176f65 100644 --- a/DDG4/src/Geant4Action.cpp +++ b/DDG4/src/Geant4Action.cpp @@ -45,7 +45,7 @@ void Geant4Action::ContextUpdate::operator()(Geant4Action* action) const { action->m_context = context; if ( 0 == action->m_context ) { - cout << "EERIOR" << endl; + cout << "ERROR" << endl; } } diff --git a/DDG4/src/Geant4InputAction.cpp b/DDG4/src/Geant4InputAction.cpp index 785f4267b115401f612d6c44ee49e0355512df94..31cd4daf356d8debb857cfabc93b0e180b723907 100644 --- a/DDG4/src/Geant4InputAction.cpp +++ b/DDG4/src/Geant4InputAction.cpp @@ -183,7 +183,7 @@ int Geant4InputAction::readParticles(int evt_number, Vertices& vertices, std::vector<Particle*>& particles) { - //in case readParticles is called diractly outside of having a run, we make sure a reader exists + //in case readParticles is called directly outside of having a run, we make sure a reader exists createReader(); int evid = evt_number + m_firstEvent; int status = m_reader->moveToEvent(evid);