Import Geant4 11.0.0 source tree

examples/advanced/gorad/src/GRInitialization.cc

@@ -99,7 +99,9 @@ void GRInitialization::Initialize()
 }
 
 #include "G4UIExecutive.hh"
+#ifdef G4UI_USE_QT
 #include "G4UIQt.hh"
+#endif
 
 void GRInitialization::SetWindowText(G4UIExecutive* ui)
 {

examples/advanced/gorad/src/GRPrimGenActionMessenger.cc

@@ -165,9 +165,9 @@ void GRPrimGenActionMessenger::SetNewValue(G4UIcommand * command,G4String newVal
   {
     specFile.getline(line,bufsize);
     if(line[(size_t)0]=='#') continue;
-    G4String valStr(line);
-    valStr = valStr.strip(G4String::both);
-    valStr = valStr.strip(G4String::trailing,0x0d);
+    G4String valStr = line;
+    G4StrUtil::strip(valStr);
+    G4StrUtil::rstrip(valStr, 0x0d);
     if(valStr.size()==0) continue;
     cmd = "/gps/hist/point " + valStr;
     ec = std::max(UI->ApplyCommand(cmd),ec);

examples/advanced/gorad/src/GRRun.cc

@@ -43,8 +43,8 @@
 
 #include "GRRun.hh"
 #include "GRRunAction.hh"
-#include "GRAnalysis.hh"
 
+#include "G4AnalysisManager.hh"
 #include "G4MultiFunctionalDetector.hh"
 #include "G4VPrimitiveScorer.hh"
 

examples/advanced/gorad/src/GRRunAction.cc

@@ -44,8 +44,8 @@
 
 #include "GRRunAction.hh"
 #include "GRRunActionMessenger.hh"
-#include "GRAnalysis.hh"
 
+#include "G4AnalysisManager.hh"
 #include "G4Run.hh"
 #include "G4RunManager.hh"
 #include "G4UnitsTable.hh"
@@ -57,6 +57,7 @@ GRRunAction::GRRunAction()
 { 
   messenger = new GRRunActionMessenger(this);
   auto analysisManager = G4AnalysisManager::Instance();
+  analysisManager->SetDefaultFileType("csv");
   G4cout << "Using " << analysisManager->GetType() << G4endl;
 
   analysisManager->SetVerboseLevel(verbose);
@@ -65,7 +66,6 @@ GRRunAction::GRRunAction()
 
 GRRunAction::~GRRunAction()
 {
-  delete G4AnalysisManager::Instance();  
   delete messenger;
 }