Import Geant4 10.6.0 source tree

examples/basic/B5/src/B5EventAction.cc

@@ -33,7 +33,6 @@
 #include "B5EmCalorimeterHit.hh"
 #include "B5HadCalorimeterHit.hh"
 #include "B5Constants.hh"
-#include "B5Analysis.hh"
 
 #include "G4Event.hh"
 #include "G4RunManager.hh"
@@ -43,6 +42,7 @@
 #include "G4SDManager.hh"
 #include "G4SystemOfUnits.hh"
 #include "G4ios.hh"
+#include "g4analysis.hh"
 
 using std::array;
 using std::vector;

examples/basic/B5/src/B5HodoscopeSD.cc

@@ -77,7 +77,7 @@ G4bool B5HodoscopeSD::ProcessHits(G4Step* step, G4TouchableHistory*)
   
   // check if this finger already has a hit
   auto ix = -1;
-  for (auto i=0;i<fHitsCollection->entries();i++) {
+  for (std::size_t i=0;i<fHitsCollection->entries();++i) {
     if ((*fHitsCollection)[i]->GetID()==copyNo) {
       ix = i;
       break;

examples/basic/B5/src/B5RunAction.cc

@@ -29,11 +29,11 @@
 
 #include "B5RunAction.hh"
 #include "B5EventAction.hh"
-#include "B5Analysis.hh"
 
 #include "G4Run.hh"
 #include "G4UnitsTable.hh"
 #include "G4SystemOfUnits.hh"
+#include "g4analysis.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -41,10 +41,9 @@ B5RunAction::B5RunAction(B5EventAction* eventAction)
  : G4UserRunAction(),
    fEventAction(eventAction)
 { 
-  // Create analysis manager
-  // The choice of analysis technology is done via selectin of a namespace
-  // in B5Analysis.hh
-  auto analysisManager = G4AnalysisManager::Instance();
+  // Create the analysis manager using a new factory method.
+  // The choice of analysis technology is done via the function argument.
+  auto analysisManager = G4Analysis::ManagerInstance("root");
   G4cout << "Using " << analysisManager->GetType() << G4endl;
 
   // Default settings