Import Geant4 10.0.0 source tree

examples/basic/B4/B4c/src/B4RunAction.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4RunAction.cc 75215 2013-10-29 16:07:06Z gcosmo $
 //
 /// \file B4RunAction.cc
 /// \brief Implementation of the B4RunAction class
@@ -41,50 +41,30 @@
 B4RunAction::B4RunAction()
  : G4UserRunAction()
 { 
-}
+  // set printing event number per each event
+  G4RunManager::GetRunManager()->SetPrintProgress(1);     
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-B4RunAction::~B4RunAction()
-{
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void B4RunAction::BeginOfRunAction(const G4Run* run)
-{ 
-  G4cout << "### Run " << run->GetRunID() << " start." << G4endl;
-
-  //inform the runManager to save random number seed
-  //G4RunManager::GetRunManager()->SetRandomNumberStore(true);
-  
-  // Book histograms, ntuple
-  //
-  
   // Create analysis manager
   // The choice of analysis technology is done via selectin of a namespace
   // in B4Analysis.hh
   G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
-  G4cout << "Using " << analysisManager->GetType() 
-         << " analysis manager" << G4endl;
+  G4cout << "Using " << analysisManager->GetType() << G4endl;
 
   // Create directories 
   //analysisManager->SetHistoDirectoryName("histograms");
   //analysisManager->SetNtupleDirectoryName("ntuple");
-  
-  // Open an output file
-  //
-  G4String fileName = "B4";
-  analysisManager->OpenFile(fileName);
+  analysisManager->SetVerboseLevel(1);
   analysisManager->SetFirstHistoId(1);
 
-  // Creating histograms
+  // Book histograms, ntuple
   //
+  
+  // Creating histograms
   analysisManager->CreateH1("1","Edep in absorber", 100, 0., 800*MeV);
   analysisManager->CreateH1("2","Edep in gap", 100, 0., 100*MeV);
   analysisManager->CreateH1("3","trackL in absorber", 100, 0., 1*m);
   analysisManager->CreateH1("4","trackL in gap", 100, 0., 50*cm);
- 
+
   // Creating ntuple
   //
   analysisManager->CreateNtuple("B4", "Edep and TrackL");
@@ -97,43 +77,69 @@ void B4RunAction::BeginOfRunAction(const G4Run* run)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void B4RunAction::EndOfRunAction(const G4Run* aRun)
+B4RunAction::~B4RunAction()
 {
-  G4int nofEvents = aRun->GetNumberOfEvent();
-  if ( nofEvents == 0 ) return;
-  
-  // print histogram statistics
-  //
-  G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
-  if ( analysisManager->GetH1(1) ) {
-    G4cout << "\n ----> print histograms statistic \n" << G4endl;
-    
-    G4cout 
-       << " EAbs : mean = " << G4BestUnit(analysisManager->GetH1(1)->mean(), "Energy") 
-               << " rms = " << G4BestUnit(analysisManager->GetH1(1)->rms(),  "Energy") 
-               << G4endl;
-    G4cout                
-       << " EGap : mean = " << G4BestUnit(analysisManager->GetH1(2)->mean(), "Energy") 
-               << " rms = " << G4BestUnit(analysisManager->GetH1(2)->rms(),  "Energy") 
-               << G4endl;
-    G4cout 
-       << " LAbs : mean = " << G4BestUnit(analysisManager->GetH1(3)->mean(), "Length") 
-               << " rms = " << G4BestUnit(analysisManager->GetH1(3)->rms(),  "Length") 
-               << G4endl;
-    G4cout 
-       << " LGap : mean = " << G4BestUnit(analysisManager->GetH1(4)->mean(), "Length") 
-               << " rms = " << G4BestUnit(analysisManager->GetH1(4)->rms(),  "Length") 
-               << G4endl;
-  }
-  
-  // save histograms 
-  //
-  analysisManager->Write();
-  analysisManager->CloseFile();
-  
-  // complete cleanup
-  //
   delete G4AnalysisManager::Instance();  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void B4RunAction::BeginOfRunAction(const G4Run* /*run*/)
+{ 
+  //inform the runManager to save random number seed
+  //G4RunManager::GetRunManager()->SetRandomNumberStore(true);
+  
+  // Get analysis manager
+  G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
+
+  // Open an output file
+  //
+  G4String fileName = "B4";
+  analysisManager->OpenFile(fileName);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void B4RunAction::EndOfRunAction(const G4Run* /*run*/)
+{
+  // print histogram statistics
+  //
+  G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
+  if ( analysisManager->GetH1(1) ) {
+    G4cout << "\n ----> print histograms statistic ";
+    if(isMaster) {
+      G4cout << "for the entire run \n" << G4endl; 
+    }
+    else {
+      G4cout << "for the local thread \n" << G4endl; 
+    }
+    
+    G4cout << " EAbs : mean = " 
+       << G4BestUnit(analysisManager->GetH1(1)->mean(), "Energy") 
+       << " rms = " 
+       << G4BestUnit(analysisManager->GetH1(1)->rms(),  "Energy") << G4endl;
+    
+    G4cout << " EGap : mean = " 
+       << G4BestUnit(analysisManager->GetH1(2)->mean(), "Energy") 
+       << " rms = " 
+       << G4BestUnit(analysisManager->GetH1(2)->rms(),  "Energy") << G4endl;
+    
+    G4cout << " LAbs : mean = " 
+      << G4BestUnit(analysisManager->GetH1(3)->mean(), "Length") 
+      << " rms = " 
+      << G4BestUnit(analysisManager->GetH1(3)->rms(),  "Length") << G4endl;
+
+    G4cout << " LGap : mean = " 
+      << G4BestUnit(analysisManager->GetH1(4)->mean(), "Length") 
+      << " rms = " 
+      << G4BestUnit(analysisManager->GetH1(4)->rms(),  "Length") << G4endl;
+  }
+
+  // save histograms & ntuple
+  //
+  analysisManager->Write();
+  analysisManager->CloseFile();
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......