renamed

include/G4System.hh

@@ -2,7 +2,7 @@
 #ifndef G4SYSTEM_HH
 #define G4SYSTEM_HH
 
-#include "ConstructionWrapper.hh"
+#include "GeometryDescriptor.hh"
 #include <stdexcept>
 #include "G4RunManagerFactory.hh"
 #include "DetectorConstruction.hh"
@@ -32,7 +32,7 @@ G4System(bool Gui=false):gui(Gui){};
 };
 
 
-void init(ConstructionWrapper &cw);
+void init(GeometryDescriptor &cw);
 //will use dawn for visualization, also wrap more in python
 void run_visualize(const std::string& partSpecies, double minEnergy_GeV, double maxEnergy_GeV);
 //runs the whole gui if available
@@ -48,10 +48,10 @@ void displayEvent()const{}; //just a placeholder, this will be implemented in py
 
 void printMaterial(const std::string& name)const;
 
-ConstructionWrapper& getConstructionWrapper(){
+GeometryDescriptor& getGeometryDescriptor(){
     check();
     if ( assigned_cw == nullptr ){
-        throw std::runtime_error("ConstructionWrapper not assigned");
+        throw std::runtime_error("GeometryDescriptor not assigned");
     }
     return *assigned_cw;
 }
@@ -59,7 +59,7 @@ ConstructionWrapper& getConstructionWrapper(){
 private:
 
 void check()const;
-ConstructionWrapper * assigned_cw=nullptr;
+GeometryDescriptor * assigned_cw=nullptr;
 
 bool gui;
 
@@ -77,7 +77,7 @@ G4UIExecutive * ui=nullptr;
 /*
 
 
-void run(ConstructionWrapper CW, int nEvents, std::string partSpecies, double minEnergy, double maxEnergy, bool gui=false){
+void run(GeometryDescriptor CW, int nEvents, std::string partSpecies, double minEnergy, double maxEnergy, bool gui=false){
 
   char* argv[]={(char*)"dummy"};
 
@@ -87,7 +87,7 @@ void run(ConstructionWrapper CW, int nEvents, std::string partSpecies, double mi
     G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
   runManager->SetNumberOfThreads(1);
 
-  ConstructionWrapper * cw = &CW;
+  GeometryDescriptor * cw = &CW;
   G4String session;
   G4UIExecutive* ui = nullptr;
   if ( gui ) {