Changeset 1342 for trunk/examples/extended/electromagnetic/TestEm8/TestEm8.cc

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/examples/extended/electromagnetic/TestEm8/TestEm8.cc (modified) (6 diffs)

trunk/examples/extended/electromagnetic/TestEm8/TestEm8.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-//
-// $Id: TestEm8.cc,v 1.9 2010/05/21 18:15:04 maire Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: TestEm8.cc,v 1.10 2010/09/08 09:12:10 vnivanch Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -35 +34 @@
 #include "Randomize.hh"
 
-#include "Em8DetectorConstruction.hh"
+#include "DetectorConstruction.hh"
 #include "PhysicsList.hh"
-#include "Em8PrimaryGeneratorAction.hh"
-#include "Em8RunAction.hh"
-#include "Em8EventAction.hh"
-#include "Em8SteppingAction.hh"
-#include "Em8SteppingVerbose.hh"
+#include "PrimaryGeneratorAction.hh"
+#include "RunAction.hh"
+#include "EventAction.hh"
 
 #ifdef G4VIS_USE
@@ -55 +52 @@
 int main(int argc,char** argv) 
 {
-
   //choose the Random engine
-
   CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
   
-  //my Verbose output class
-
-  G4VSteppingVerbose::SetInstance(new Em8SteppingVerbose);
-    
   // Construct the default run manager
-
   G4RunManager * runManager = new G4RunManager;
 
   // set mandatory initialization classes
-
-  Em8DetectorConstruction* detector;
-  detector = new Em8DetectorConstruction;
-  runManager->SetUserInitialization(detector);
   runManager->SetUserInitialization(new PhysicsList);
+  PrimaryGeneratorAction* gun = new PrimaryGeneratorAction();
+  runManager->SetUserInitialization(new DetectorConstruction(gun));
  
   // set user action classes
-
-  runManager->SetUserAction(new Em8PrimaryGeneratorAction(detector));
-
-  Em8RunAction* runAction = new Em8RunAction;
-
-  runManager->SetUserAction(runAction);
-
-  Em8EventAction* eventAction = new Em8EventAction(runAction);
-
-  runManager->SetUserAction(eventAction);
-
-  Em8SteppingAction* steppingAction = new Em8SteppingAction(detector,
-                                                            eventAction, 
-                                                            runAction);
-  runManager->SetUserAction(steppingAction);
+  runManager->SetUserAction(gun);
+  runManager->SetUserAction(new RunAction());
+  runManager->SetUserAction(new EventAction());
   
   G4UImanager* UI = G4UImanager::GetUIpointer();  
@@ -96 +72 @@
   if (argc!=1)   // batch mode  
     {
-     G4String command = "/control/execute ";
-     G4String fileName = argv[1];
-     UI->ApplyCommand(command+fileName);
+      G4String command = "/control/execute ";
+      G4String fileName = argv[1];
+      UI->ApplyCommand(command+fileName);
     }
     
@@ -104 +80 @@
     { 
 #ifdef G4VIS_USE
-   G4VisManager* visManager = new G4VisExecutive;
-   visManager->Initialize();
+      G4VisManager* visManager = new G4VisExecutive;
+      visManager->Initialize();
 #endif    
      
@@ -115 +91 @@
      
 #ifdef G4VIS_USE
-     delete visManager;
+      delete visManager;
 #endif     
     }