minor changes related to #6

Author: lobis

CMakeLists.txt

@@ -1,4 +1,4 @@
-set( LibraryVersion "1.2" )
+set(LibraryVersion "1.2")
 add_definitions(-DLIBRARY_VERSION="${LibraryVersion}")
 
 if (${REST_DECAY0} MATCHES "ON")
@@ -14,28 +14,28 @@ if (${REST_DECAY0} MATCHES "ON")
     #
 
     execute_process(
-     COMMAND bxdecay0-config --version
-     OUTPUT_VARIABLE BxDecay0_VERSION
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
-    
-	execute_process(
-     COMMAND bxdecay0-config --incdir 
-     OUTPUT_VARIABLE BxDecay0_INCLUDE_DIRS
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  
-	execute_process(
-     COMMAND bxdecay0-config --libdir
-     OUTPUT_VARIABLE BxDecay0_LIBRARY_DIRS
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-
-    if(NOT DEFINED BxDecay0_VERSION)
-       message(FATAL_ERROR "bxdecay0 not found! Put its binary dir to PATH!")
-    endif()
-
-    message (STATUS "Found BxDecay0. Version ='${BxDecay0_VERSION}'")
-    message (STATUS "Found BxDecay0. Include path ='${BxDecay0_INCLUDE_DIRS}'")
-    message (STATUS "Found BxDecay0. Library path ='${BxDecay0_LIBRARY_DIRS}'")
+            COMMAND bxdecay0-config --version
+            OUTPUT_VARIABLE BxDecay0_VERSION
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    execute_process(
+            COMMAND bxdecay0-config --incdir
+            OUTPUT_VARIABLE BxDecay0_INCLUDE_DIRS
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    execute_process(
+            COMMAND bxdecay0-config --libdir
+            OUTPUT_VARIABLE BxDecay0_LIBRARY_DIRS
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+
+    if (NOT DEFINED BxDecay0_VERSION)
+        message(FATAL_ERROR "bxdecay0 not found! Put its binary dir to PATH!")
+    endif ()
+
+    message(STATUS "Found BxDecay0. Version ='${BxDecay0_VERSION}'")
+    message(STATUS "Found BxDecay0. Include path ='${BxDecay0_INCLUDE_DIRS}'")
+    message(STATUS "Found BxDecay0. Library path ='${BxDecay0_LIBRARY_DIRS}'")
 
     set(external_include_dirs ${external_include_dirs} ${BxDecay0_INCLUDE_DIRS})
     set(external_libs "${external_libs} -L${BxDecay0_LIBRARY_DIRS} -lBxDecay0")
@@ -44,11 +44,11 @@ if (${REST_DECAY0} MATCHES "ON")
     set(feature_added ${feature_added} PARENT_SCOPE)
 else ()
     set(REST_DECAY0 OFF)
-    set(excludes ${excludes} TRestGeant4ParticleCollectionDecay0 )
+    set(excludes ${excludes} TRestGeant4ParticleCollectionDecay0)
 endif (${REST_DECAY0} MATCHES "ON")
 
 if (NOT ${REST_EVE} MATCHES "ON")
-    set(excludes ${excludes} TRestGeant4EventViewer )
+    set(excludes ${excludes} TRestGeant4EventViewer)
 endif ()
 
 COMPILELIB("")

inc/TRestGeant4Particle.h

@@ -16,11 +16,11 @@
 #ifndef RestCore_TRestGeant4Particle
 #define RestCore_TRestGeant4Particle
 
-#include <iostream>
-
+#include <TObject.h>
 #include <TString.h>
 #include <TVector3.h>
-#include "TObject.h"
+
+#include <iostream>
 
 class TRestGeant4Particle : public TObject {
    protected:
@@ -39,17 +39,17 @@ class TRestGeant4Particle : public TObject {
     Int_t GetParticleCharge() { return fCharge; }
     TVector3 GetOrigin() { return fOrigin; }
 
-    void SetParticle(TRestGeant4Particle ptcle) {
-        fExcitationLevel = ptcle.GetExcitationLevel();
-        fParticleName = ptcle.GetParticleName();
-        fEnergy = ptcle.GetEnergy();
-        fDirection = ptcle.GetMomentumDirection();
-        fOrigin = ptcle.fOrigin;
+    void SetParticle(TRestGeant4Particle particle) {
+        fExcitationLevel = particle.GetExcitationLevel();
+        fParticleName = particle.GetParticleName();
+        fEnergy = particle.GetEnergy();
+        fDirection = particle.GetMomentumDirection();
+        fOrigin = particle.fOrigin;
     }
 
-    void SetParticleName(TString ptcle) { fParticleName = ptcle; }
-    void SetExcitationLevel(Double_t eenergy) {
-        fExcitationLevel = eenergy;
+    void SetParticleName(TString particle) { fParticleName = particle; }
+    void SetExcitationLevel(Double_t eEnergy) {
+        fExcitationLevel = eEnergy;
         if (fExcitationLevel < 0) fExcitationLevel = 0;
     }
 

inc/TRestGeant4ParticleCollection.h

@@ -16,20 +16,19 @@
 #ifndef RestCore_TRestGeant4ParticleCollection
 #define RestCore_TRestGeant4ParticleCollection
 
-#include <iostream>
-
-#include "TObject.h"
-
+#include <TObject.h>
 #include <TRestGeant4Particle.h>
 
+#include <iostream>
+
 class TRestGeant4ParticleCollection : public TObject {
    protected:
     std::vector<TRestGeant4Particle> fParticles;
 
    public:
     static TRestGeant4ParticleCollection* instantiate(std::string model = "");
 
-    virtual void SetParticleModel(std::string modelstring) {
+    virtual void SetParticleModel(std::string modelString) {
         std::cout << "REST ERROR: SetParticleModel() called in base class "
                      "TRestGeant4ParticleCollection"
                   << std::endl;
@@ -41,9 +40,9 @@ class TRestGeant4ParticleCollection : public TObject {
     virtual TRestGeant4Particle GetParticle(int i) { return fParticles[i]; }
 
     virtual void RemoveParticles() { fParticles.clear(); }
-    virtual void AddParticle(TRestGeant4Particle ptcle) { fParticles.push_back(ptcle); }
+    virtual void AddParticle(TRestGeant4Particle particle) { fParticles.push_back(particle); }
 
-    // Construtor
+    // Constructor
     TRestGeant4ParticleCollection();
     // Destructor
     virtual ~TRestGeant4ParticleCollection();

src/TRestGeant4Metadata.cxx

@@ -952,7 +952,6 @@ void TRestGeant4Metadata::ReadGenerator() {
     // TODO : If not defined (and required to be) it just returns (0,0,0) we
     // should make a WARNING. Inside StringToVector probably
     fGenPosition = Get3DVectorParameterWithUnits("position", generatorDefinition);
-
     fGenRotation = StringTo3DVector(GetParameter("rotation", generatorDefinition));
 
     string dimension2[2]{"length", "lenY"};
@@ -987,7 +986,6 @@ void TRestGeant4Metadata::ReadGenerator() {
             fGeneratorFile = use;
             info << "Reading custom sources from ROOT file : " << fGeneratorFile << endl;
             ReadGeneratorTreeFile(fGeneratorFile);
-            // exit(1);
         } else {
             info << "Load custom sources from " << use << endl;
             TRestGeant4ParticleCollection* particleCollection =
@@ -1188,15 +1186,16 @@ void TRestGeant4Metadata::ReadGeneratorTreeFile(TString fName) {
     debug << "TRestGeant4Metadata::ReadGeneratorTreeFile" << endl;
 
     TFile* file;
+    TTree* GeneratorTree;
+    TString treeName = "GeneratorTree";
+
     file = TFile::Open(fName, "READ");
     if (!file) {
         ferr << "Error opening file: " << fName << endl;
         exit(1);
     }
-
-    TTree* GeneratorTree;
-    TString treeName = "GeneratorTree";
     file->GetObject(treeName, GeneratorTree);
+
     if (!GeneratorTree) {
         ferr << "Error reading TTree named " << treeName << " from " << fName << endl;
         file->ls();
@@ -1214,10 +1213,10 @@ void TRestGeant4Metadata::ReadGeneratorTreeFile(TString fName) {
 
     debug << "Setting up TTree" << endl;
 
-    vector<double>*x, *y, *z;
-    vector<double>*px, *py, *pz;
-    vector<double>*KE, *timeGlobal, *weight;
-    vector<TString>* particleName;
+    vector<double>*x = 0, *y = 0, *z = 0;
+    vector<double>*px = 0, *py = 0, *pz = 0;
+    vector<double>*KE = 0, *timeGlobal = 0, *weight = 0;
+    vector<TString>* particleName = 0;
 
     GeneratorTree->SetBranchAddress("x", &x);
     GeneratorTree->SetBranchAddress("y", &y);
@@ -1232,9 +1231,6 @@ void TRestGeant4Metadata::ReadGeneratorTreeFile(TString fName) {
 
     debug << "Finished setting up TTree" << endl;
 
-    GeneratorTree->Show(0);
-    GeneratorTree->GetEntry(0);
-
     TRestGeant4Particle particle;
     for (int k = 0; k < numberOfGeneratorEvents; k++) {
         debug << "- Getting entry " << k << endl;
@@ -1244,6 +1240,7 @@ void TRestGeant4Metadata::ReadGeneratorTreeFile(TString fName) {
         particleCollection->RemoveParticles();
 
         int nParticles = x->size();
+        debug << "Number of particles: " << nParticles << endl;
 
         for (int i = 0; i < nParticles; i++) {
             TString thisParticleName = (*particleName)[i];
@@ -1303,7 +1300,7 @@ void TRestGeant4Metadata::ReadEventDataFile(TString fName) {
 ///////////////////////////////////////////////
 /// \brief Reads particle information using the file format from newer Decay0 versions.
 ///
-/// This is an auxiliar method used in TRestGeant4Metadata::ReadEventDataFile that will read the Decay0 files
+/// This is an auxiliary method used in TRestGeant4Metadata::ReadEventDataFile that will read the Decay0 files
 /// produced with the newer Decay0 versions.
 ///
 Int_t TRestGeant4Metadata::ReadNewDecay0File(TString fileName) {
@@ -1406,7 +1403,7 @@ Int_t TRestGeant4Metadata::ReadNewDecay0File(TString fileName) {
 ///////////////////////////////////////////////
 /// \brief Reads particle information using the file format from older Decay0 versions.
 ///
-/// This is an auxiliar method used in TRestGeant4Metadata::ReadEventDataFile that will read the Decay0 files
+/// This is an auxiliary method used in TRestGeant4Metadata::ReadEventDataFile that will read the Decay0 files
 /// produced with the newer Decay0 versions.
 ///
 Int_t TRestGeant4Metadata::ReadOldDecay0File(TString fileName) {