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

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/examples/extended/electromagnetic/TestEm7/TestEm7.cc (modified) (3 diffs)

trunk/examples/extended/electromagnetic/TestEm7/TestEm7.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: TestEm7.cc,v 1.9 2010/05/21 18:00:26 maire Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: TestEm7.cc,v 1.10 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -43 +43 @@
 #include "SteppingAction.hh"
 #include "SteppingVerbose.hh"
+#include "HistoManager.hh"
 
 #ifdef G4VIS_USE
@@ -66 +67 @@
 
   //set mandatory initialization classes
-  DetectorConstruction* det;
-  PhysicsList* phys;
-  PrimaryGeneratorAction* kin;
-  runManager->SetUserInitialization(det  = new DetectorConstruction);
-  runManager->SetUserInitialization(phys = new PhysicsList);
-  runManager->SetUserAction(kin = new PrimaryGeneratorAction(det));
+  //
+  DetectorConstruction*   det  = new DetectorConstruction();
+  PhysicsList*            phys = new PhysicsList();
+  
+  runManager->SetUserInitialization(det);
+  runManager->SetUserInitialization(phys);
   
   //set user action classes
-   RunAction* run;
+  //
+  HistoManager*           histo = new HistoManager();
+  PrimaryGeneratorAction* kin   = new PrimaryGeneratorAction(det);  
+  RunAction*              run   = new RunAction(det,phys,histo,kin);
+  EventAction*            event = new EventAction();
+  TrackingAction*         track = new TrackingAction(det,histo,run);
+  SteppingAction*         step  = new SteppingAction(det,histo,run);
   
-  runManager->SetUserAction(run = new RunAction(det,phys,kin)); 
-  runManager->SetUserAction(new EventAction);
-  runManager->SetUserAction(new TrackingAction(run));  
-  runManager->SetUserAction(new SteppingAction(det,run));
+  runManager->SetUserAction(kin); 
+  runManager->SetUserAction(run); 
+  runManager->SetUserAction(event);
+  runManager->SetUserAction(track);  
+  runManager->SetUserAction(step);
 
   //get the pointer to the User Interface manager