Import Geant4 6.2.0 source tree

2016-06-09 10:56:29 +02:00
parent 1d812b78b1
commit e083ffb441
1415 changed files with 111223 additions and 21207 deletions
@@ -31,109 +31,20 @@
 // 28 Nov 2001 Elena Guardincerri     Created
 //
 // -------------------------------------------------------------------
-#include "G4RunManager.hh"
-#include "G4UImanager.hh"
-#include "G4UIterminal.hh"
-#include "G4UItcsh.hh"
-#ifdef G4UI_USE_XM
-#include "G4UIXm.hh"
-#endif
-#include "Randomize.hh"
-#ifdef G4VIS_USE
-#include "XrayFluoVisManager.hh"
-#endif
-#include "XrayFluoDetectorConstruction.hh"
-#include "XrayFluoPhysicsList.hh"
-#include "XrayFluoPrimaryGeneratorAction.hh"
-#include "XrayFluoRunAction.hh"
-#include "XrayFluoEventAction.hh"
-#include "XrayFluoSteppingAction.hh"
-#include "XrayFluoSteppingVerbose.hh"

-int main(int argc,char** argv) {

-  // choose the Random engine
-  HepRandom::setTheEngine(new RanecuEngine);
+#include "XrayFluoSimulation.hh"
+;
+int main(int argc, char* argv[]){

-  //XrayFluo Verbose output class
-  G4VSteppingVerbose::SetInstance(new XrayFluoSteppingVerbose);
-     
-  // Construct the default run manager
-  G4RunManager * runManager = new G4RunManager;
+  XrayFluoSimulation * simulation = new XrayFluoSimulation(0);  

-  // set mandatory initialization classes
-  XrayFluoDetectorConstruction* detector = new XrayFluoDetectorConstruction;
-  runManager->SetUserInitialization(detector);
-  XrayFluoPhysicsList* list = new   XrayFluoPhysicsList(detector);
-  runManager->SetUserInitialization(list);
-  
-  G4UIsession* session=0;
-  
-  if (argc==1)   // Define UI session for interactive mode.
-    {
-      // G4UIterminal is a (dumb) terminal.
-#ifdef G4UI_USE_XM
-      session = new G4UIXm(argc,argv);
-#else           
-#ifdef G4UI_USE_TCSH
-      session = new G4UIterminal(new G4UItcsh);
-#else
-      session = new G4UIterminal();
-#endif
-#endif
-    }
-  
-#ifdef G4VIS_USE
-  //visualization manager
-  G4VisManager* visManager = new XrayFluoVisManager;
-  visManager->Initialize();
-#endif
- 
-  XrayFluoEventAction* eventAction = new XrayFluoEventAction();
-  XrayFluoRunAction* runAction = new XrayFluoRunAction();
-  XrayFluoSteppingAction* stepAction = new XrayFluoSteppingAction();
+  simulation->RunSimulation(argc,argv);

-  runManager->SetUserAction(new XrayFluoPrimaryGeneratorAction(detector));
-  
-  runManager->SetUserAction(eventAction); 
-  runManager->SetUserAction(runAction);
-  runManager->SetUserAction(stepAction);
-  
-  //Initialize G4 kernel
-  runManager->Initialize();
-  
-  // get the pointer to the User Interface manager 
-  G4UImanager* UI = G4UImanager::GetUIpointer();
-  
-  if (session)   // Define UI session for interactive mode.
-    {
-      // G4UIterminal is a (dumb) terminal.
-      UI->ApplyCommand("/control/execute initInter.mac");    
-#ifdef G4UI_USE_XM
-      // Customize the G4UIXm menubar with a macro file :
-      UI->ApplyCommand("/control/execute gui.mac");
-#endif
-      session->SessionStart();
-      delete session;
-    }
-  else           // Batch mode
-    { 
-      G4String command = "/control/execute ";
-      G4String fileName = argv[1];
-      UI->ApplyCommand(command+fileName);
-    }
-  
-  // job termination
-  
-#ifdef G4VIS_USE
-  delete visManager;
-#endif
-   
-   delete runManager;
-   return 0;
+  delete simulation;
+
+  return 0;
 }

- 
-