From 21396c1b442a30d09b98c756b88053c14f6e6780 Mon Sep 17 00:00:00 2001
From: Jan Kieseler <jkiesele@cern.ch>
Date: Sat, 9 Sep 2023 01:50:40 +0200
Subject: [PATCH] checks

---
 include/ActionInitialization.hh   | 2 +-
 include/PrimaryGeneratorAction.hh | 2 +-
 include/SystemBuilder.hh          | 2 +-
 src/SystemBuilder.cc              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/ActionInitialization.hh b/include/ActionInitialization.hh
index 4f05e33..b41800a 100644
--- a/include/ActionInitialization.hh
+++ b/include/ActionInitialization.hh
@@ -56,7 +56,7 @@ class ActionInitialization : public G4VUserActionInitialization
         this->minEnergy = minEnergy;
         this->maxEnergy = maxEnergy;
         this->partSpecies = partSpecies;
-        
+        G4cout << "ActionInitialization: Setting particle species to " << partSpecies << G4endl;
     }
 
   private:
diff --git a/include/PrimaryGeneratorAction.hh b/include/PrimaryGeneratorAction.hh
index 851b651..e681905 100644
--- a/include/PrimaryGeneratorAction.hh
+++ b/include/PrimaryGeneratorAction.hh
@@ -64,7 +64,7 @@ public:
     if(partSpecies == "e-"){
       G4cout << "Particle species set to electron" << G4endl;
     }
-    if(partSpecies == "e+"){
+    else if(partSpecies == "e+"){
       G4cout << "Particle species set to positron" << G4endl;
     }
     else if(partSpecies == "gamma"){
diff --git a/include/SystemBuilder.hh b/include/SystemBuilder.hh
index c57a076..663ff07 100644
--- a/include/SystemBuilder.hh
+++ b/include/SystemBuilder.hh
@@ -31,7 +31,7 @@ SystemBuilder(){};
 void init(ConstructionWrapper &cw, bool gui=false);
 void visualize()const{} //TBI
 void run_gui();
-void run_batch(int nEvents, char* partSpecies, double minEnergy, double maxEnergy);
+void run_batch(int nEvents, const std::string& partSpecies, double minEnergy, double maxEnergy);
 
 private:
 
diff --git a/src/SystemBuilder.cc b/src/SystemBuilder.cc
index 0267780..518cf93 100644
--- a/src/SystemBuilder.cc
+++ b/src/SystemBuilder.cc
@@ -59,7 +59,7 @@ void SystemBuilder::run_gui(){
   }
 }
 
-void SystemBuilder::run_batch(int nEvents, char* partSpecies, double minEnergy, double maxEnergy){
+void SystemBuilder::run_batch(int nEvents,const std::string& partSpecies, double minEnergy, double maxEnergy){
     G4String partSpec = partSpecies;
     G4cout << "running with particle species " << partSpec << G4endl;
     actionInitialization->setGeneratorProperties(minEnergy, maxEnergy, partSpec);