changed to GeV

bind/bindings.cpp

@@ -21,8 +21,8 @@ void makeG4System(M& m, std::string name){
     py::class_<G4System>(m, name.data()).def(py::init())
     .def("init", &G4System::init, py::arg("cw"), py::arg("gui")=false)
     .def("run_gui", &G4System::run_gui)
-    .def("run_batch", &G4System::run_batch, py::arg("nEvents"), py::arg("partSpecies"), py::arg("minEnergy"), py::arg("maxEnergy"))
-    .def("run_visualize", &G4System::run_visualize, py::arg("partSpecies"), py::arg("minEnergy"), py::arg("maxEnergy"))
+    .def("run_batch", &G4System::run_batch, py::arg("nEvents"), py::arg("partSpecies"), py::arg("minEnergy_GeV"), py::arg("maxEnergy_GeV"))
+    .def("run_visualize", &G4System::run_visualize, py::arg("partSpecies"), py::arg("minEnergy_GeV"), py::arg("maxEnergy_GeV"))
     .def("applyUICommand", &G4System::applyUICommand, py::arg("command"));
 }
 

include/G4System.hh

@@ -33,10 +33,10 @@ G4System(){};
 
 void init(ConstructionWrapper &cw, bool gui=false);
 //will use dawn for visualization, also wrap more in python
-void run_visualize(const std::string& partSpecies, double minEnergy, double maxEnergy);
+void run_visualize(const std::string& partSpecies, double minEnergy_GeV, double maxEnergy_GeV);
 //runs the whole gui if available
 void run_gui();
-void run_batch(int nEvents, const std::string& partSpecies, double minEnergy, double maxEnergy);
+void run_batch(int nEvents, const std::string& partSpecies, double minEnergy_GeV, double maxEnergy_GeV);
 
 void applyUICommand(const std::string& command){
     check();

src/PrimaryGeneratorAction.cc

@@ -90,7 +90,7 @@ void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
   }
   fParticleGun->SetParticleDefinition(particleDefinition);
   fParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,1.));
-  fParticleGun->SetParticleEnergy(partEnergy*MeV);
+  fParticleGun->SetParticleEnergy(partEnergy*GeV);
 
   // In order to avoid dependence of PrimaryGeneratorAction
   // on DetectorConstruction class we get world volume