Import Geant4 10.5.0 source tree

examples/extended/medical/dna/dnaphysics/src/ActionInitialization.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file ActionInitialization.cc
 /// \brief Implementation of the ActionInitialization class
@@ -54,7 +53,9 @@ ActionInitialization::~ActionInitialization()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void ActionInitialization::BuildForMaster() const
-{}
+{
+  SetUserAction(new RunAction());
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

examples/extended/medical/dna/dnaphysics/src/DetectorConstruction.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file DetectorConstruction.cc
 /// \brief Implementation of the DetectorConstruction class

examples/extended/medical/dna/dnaphysics/src/DetectorMessenger.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file DetectorMessenger.cc
 /// \brief Implementation of the DetectorMessenger class

examples/extended/medical/dna/dnaphysics/src/PhysicsList.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file PhysicsList.cc
 /// \brief Implementation of the PhysicsList class

examples/extended/medical/dna/dnaphysics/src/PrimaryGeneratorAction.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file PrimaryGeneratorAction.cc
 /// \brief Implementation of the PrimaryGeneratorAction class

examples/extended/medical/dna/dnaphysics/src/RunAction.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file RunAction.cc
 /// \brief Implementation of the RunAction class
@@ -42,17 +41,7 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 RunAction::RunAction(): G4UserRunAction()
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-RunAction::~RunAction()
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void RunAction::BeginOfRunAction(const G4Run*)
-{  
+{
   // Book histograms, ntuple
   
   // Create analysis manager
@@ -60,19 +49,16 @@ void RunAction::BeginOfRunAction(const G4Run*)
   // in Analysis.hh
 
   G4cout << "##### Create analysis manager " << "  " << this << G4endl;
-  G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
+  auto analysisManager = G4AnalysisManager::Instance();
   
+  analysisManager->SetNtupleMerging(true);
+    
   G4cout << "Using " << analysisManager->GetType()
       << " analysis manager"
       << G4endl;
 
   analysisManager->SetVerboseLevel(1);
   
-  // Open an output file
-  
-  G4String fileName = "dna";
-  analysisManager->OpenFile(fileName);
-
   // Creating ntuple
   
   analysisManager->CreateNtuple("dna", "dnaphysics");
@@ -91,6 +77,26 @@ void RunAction::BeginOfRunAction(const G4Run*)
   analysisManager->CreateNtupleIColumn("parentID");
   analysisManager->CreateNtupleIColumn("stepID");
   analysisManager->FinishNtuple();
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+RunAction::~RunAction()
+{
+  delete G4AnalysisManager::Instance(); 
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void RunAction::BeginOfRunAction(const G4Run*)
+{  
+  auto analysisManager = G4AnalysisManager::Instance();
+
+  // Open an output file
+  
+  G4String fileName = "dna";
+  analysisManager->OpenFile(fileName);
 }
  
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -102,14 +108,10 @@ void RunAction::EndOfRunAction(const G4Run* aRun)
   
   // print histogram statistics
   
-  G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
+  auto analysisManager = G4AnalysisManager::Instance();
   
   // save histograms 
   
   analysisManager->Write();
   analysisManager->CloseFile();
-  
-  // complete cleanup
-  
-  delete G4AnalysisManager::Instance();  
 }

examples/extended/medical/dna/dnaphysics/src/SteppingAction.cc

@@ -29,7 +29,6 @@
 // Med. Phys. 37 (2010) 4692-4708
 // The Geant4-DNA web site is available at http://geant4-dna.org
 //
-// $Id$
 //
 /// \file SteppingAction.cc
 /// \brief Implementation of the SteppingAction class