Import Geant4 11.0.0 source tree

examples/extended/hadronic/Hadr03/src/HistoManager.cc

@@ -45,7 +45,6 @@ HistoManager::HistoManager()
 
 HistoManager::~HistoManager()
 {
-  //  delete G4AnalysisManager::Instance();
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -56,6 +55,7 @@ void HistoManager::Book()
   // The choice of analysis technology is done via selection of a namespace
   // in HistoManager.hh
   G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
+  analysisManager->SetDefaultFileType("root");
   analysisManager->SetFileName(fFileName);
   analysisManager->SetVerboseLevel(1);
   analysisManager->SetActivation(true);     //enable inactivation of histograms

examples/extended/hadronic/Hadr03/src/Run.cc

@@ -78,6 +78,7 @@ void Run::SetTargetXXX(G4bool flag)
 
 void Run::CountProcesses(G4VProcess* process) 
 {
+  if (process == nullptr) return;
   G4String procName = process->GetProcessName();
   std::map<G4String,G4int>::iterator it = fProcCounter.find(procName);
   if ( it == fProcCounter.end()) {