renamed
This commit is contained in:
+6
-6
@@ -39,7 +39,7 @@
|
||||
#include "FTFP_BERT.hh"
|
||||
#include "Randomize.hh"
|
||||
|
||||
#include "ConstructionWrapper.hh"
|
||||
#include "GeometryDescriptor.hh"
|
||||
|
||||
#include "G4System.hh"
|
||||
|
||||
@@ -121,7 +121,7 @@ int main2(int argc,char** argv)
|
||||
}
|
||||
#endif
|
||||
|
||||
ConstructionWrapper * cw = new ConstructionWrapper();
|
||||
GeometryDescriptor * cw = new GeometryDescriptor();
|
||||
cw->addLayer(1, "G4_Pb", false);
|
||||
cw->addLayer(10, "G4_Si", true, 9);
|
||||
cw->addLayer(1, "G4_Pb", false);
|
||||
@@ -185,11 +185,11 @@ int main2(int argc,char** argv)
|
||||
//later
|
||||
//class Runner {
|
||||
//public:
|
||||
// void initialize(ConstructionWrapper CW, bool gui=false);
|
||||
// void initialize(GeometryDescriptor CW, bool gui=false);
|
||||
// void run(int nEvents, std::string partSpecies, double minEnergy, double maxEnergy);
|
||||
//}
|
||||
|
||||
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"};
|
||||
|
||||
@@ -199,7 +199,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 ) {
|
||||
@@ -261,7 +261,7 @@ void run(ConstructionWrapper CW, int nEvents, std::string partSpecies, double mi
|
||||
|
||||
int main(){
|
||||
|
||||
ConstructionWrapper cw;
|
||||
GeometryDescriptor cw;
|
||||
//to be moved
|
||||
cw.addLayer(1, "G4_Pb", false);
|
||||
cw.addLayer(10, "G4_Si", true, 9);
|
||||
|
||||
Reference in New Issue
Block a user