Import Geant4 11.0.0 source tree

examples/advanced/microbeam/src/EventAction.cc

@@ -33,11 +33,11 @@
 // Rad. Prot. Dos. 133 (2009) 2-11
 
 #include "G4Event.hh"
+#include "G4AnalysisManager.hh"
 #include "Randomize.hh"
 
 #include "EventAction.hh"
 #include "RunAction.hh"
-#include "Analysis.hh"
 
 EventAction::EventAction(RunAction* run)
 :fRun(run)

examples/advanced/microbeam/src/RunAction.cc

@@ -35,8 +35,8 @@
 #include "RunAction.hh"
 
 #include "G4UImanager.hh"
+#include "G4AnalysisManager.hh"
 #include "Randomize.hh"
-#include "Analysis.hh"
 
 RunAction::RunAction(const DetectorConstruction* det) 
 :fDetector(det)
@@ -62,6 +62,7 @@ void RunAction::BeginOfRunAction(const G4Run*)
   G4cout << "##### Create analysis manager " << "  " << this << G4endl;
   
   G4AnalysisManager* man = G4AnalysisManager::Instance();
+  man->SetDefaultFileType("root");
   
   G4cout << "Using " << man->GetType() << " analysis manager" << G4endl;
 
@@ -179,7 +180,7 @@ void RunAction::EndOfRunAction(const G4Run* /*aRun*/)
   //save histograms      
   man->Write();
   man->CloseFile();
-  
+
   // Complete clean-up
-  delete G4AnalysisManager::Instance();
+  man->Clear();
 }

examples/advanced/microbeam/src/SteppingAction.cc

@@ -35,7 +35,7 @@
 #include "SteppingAction.hh"
 #include "RunAction.hh"
 #include "DetectorConstruction.hh"
-#include "Analysis.hh"
+#include "G4AnalysisManager.hh"
 #include "G4SystemOfUnits.hh"
 #include "G4SteppingManager.hh"
 #include "G4Alpha.hh"