Import Geant4 10.3.0 source tree

source/analysis/management/include/G4BaseFileManager.hh

@@ -50,7 +50,7 @@ class G4BaseFileManager
       // Return the base file name (without extension)
 
     G4String GetFullFileName(const G4String& baseFileName = "",
-                           G4bool isPerThread = true) const;
+                             G4bool isPerThread = true) const;
       // Compose and return the full file name:
       // - add _tN suffix to the file base name if isPerThread
       // - add file extension if not present
@@ -67,6 +67,11 @@ class G4BaseFileManager
       // - add _tN suffix if called on thread worker
       // - add file extension if not present
     
+    G4String GetNtupleFileName(G4int ntupleFileNumber) const;
+      // Compose and return the ntuple specific file name:
+      // - add _mN suffix to the file base name 
+      // - add file extension if not present
+    
     G4String GetPlotFileName() const;
       // Return the file name for batch plotting output
 

source/analysis/management/include/G4PlotManager.hh

@@ -115,7 +115,7 @@ inline G4bool G4PlotManager::PlotAndWrite(const std::vector<T*>& htVector,
     // set color (only blue for the time being)
     tools::sg::plotter& plotter = fViewer->plots().current_plotter();
     // set plot properties (use info object to get these)
-    plotter.bins_style(0).color = tools::colorf::blue();
+    plotter.bins_style(0).color = tools::colorf_blue();
     
     isWriteNeeded = true;
 

source/analysis/management/include/G4THnManager.icc

@@ -73,12 +73,12 @@ T*  G4THnManager<T>::GetTInFunction(G4int id,
       description << "      " << "histogram " << id << " does not exist.";
       G4Exception(inFunction, "Analysis_W011", JustWarning, description);
     }
-    return 0;         
+    return nullptr;         
   }
   
   // Do not return histogram if inactive 
   if ( fState.GetIsActivation() && onlyIfActive && ( ! fHnManager->GetActivation(id) ) ) {
-    return 0; 
+    return nullptr; 
   }  
   
   return fTVector[index];

source/analysis/management/include/G4TNtupleManager.icc

@@ -125,7 +125,7 @@ G4int G4TNtupleManager<TNTUPLE>::CreateNtupleTColumn(
   }  
 #endif
   
-  auto ntupleDescription = GetNtupleDescriptionInFunction(ntupleId, "CreateNtupleIColumn");
+  auto ntupleDescription = GetNtupleDescriptionInFunction(ntupleId, "CreateNtupleTColumn");
   if ( ! ntupleDescription )  return G4Analysis::kInvalidId;   
     
   // Save column info in booking
@@ -412,8 +412,9 @@ void G4TNtupleManager<TNTUPLE>::FinishNtuple(
 #endif
 
   // check that ntuple was really created
-  auto ntuple = GetNtupleInFunction(ntupleId, "FinishNtuple", false);
-  if ( ! ntuple )  return;   
+  // auto ntuple = GetNtupleInFunction(ntupleId, "FinishNtuple", false);
+  // if ( ! ntuple )  return;   
+      // The test has to be now done in the FinishTNtuple implementations
 
   FinishTNtuple(ntupleDescription);
 

source/analysis/management/include/G4VAnalysisManager.hh

@@ -621,7 +621,8 @@ class G4VAnalysisManager
     std::unique_ptr<G4VH3Manager>  fVH3Manager;
     std::unique_ptr<G4VP1Manager>  fVP1Manager;
     std::unique_ptr<G4VP2Manager>  fVP2Manager;
-    std::unique_ptr<G4VNtupleManager> fVNtupleManager;
+    // std::shared_ptr<G4VNtupleManager> fVNtupleManager;
+    G4VNtupleManager* fVNtupleManager;
 };
 
 // inline functions