Import Geant4 10.0.0 source tree

examples/extended/electromagnetic/TestEm2/src/EventAction.cc

@@ -26,7 +26,7 @@
 /// \file electromagnetic/TestEm2/src/EventAction.cc
 /// \brief Implementation of the EventAction class
 //
-// $Id$
+// $Id: EventAction.cc 76259 2013-11-08 11:37:28Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -34,14 +34,16 @@
 #include "EventAction.hh"
 
 #include "EventActionMessenger.hh"
-#include "RunAction.hh"
+#include "Run.hh"
 #include "G4Event.hh"
+#include "G4RunManager.hh"
 #include "G4UnitsTable.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-EventAction::EventAction(RunAction* run)
-:fRun(run),fDrawFlag("none"),fPrintModulo(10000)
+EventAction::EventAction()
+:G4UserEventAction(),
+ fPrintModulo(10000),fEventMessenger(0)
 {
   fEventMessenger = new EventActionMessenger(this);
 }
@@ -64,14 +66,20 @@ void EventAction::BeginOfEventAction(const G4Event* evt)
     G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
 
  //additional initializations 
- fRun->InitializePerEvent();
+ Run* run 
+    = static_cast<Run*>(
+        G4RunManager::GetRunManager()->GetNonConstCurrentRun()); 
+ run->InitializePerEvent();
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void EventAction::EndOfEventAction(const G4Event*)
 {  
-  fRun->FillPerEvent();  
+ Run* run 
+    = static_cast<Run*>(
+        G4RunManager::GetRunManager()->GetNonConstCurrentRun()); 
+ run->FillPerEvent();  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......