Import Geant4 11.1.0 source tree

source/analysis/root/include/G4RootPNtupleManager.icc

@@ -33,10 +33,6 @@ template <>
 inline G4bool G4RootPNtupleManager::FillNtupleTColumn(
   G4int ntupleId, G4int columnId, const std::string& value)
 {
-  if (fCreateNtuples) {
-    CreateNtuplesFromMain();
-  }
-
   if ( fState.GetIsActivation() && ( ! GetActivation(ntupleId) ) ) {
     G4cout << "Skipping FillNtupleIColumn for " << ntupleId << G4endl;
     return false;
@@ -48,8 +44,12 @@ inline G4bool G4RootPNtupleManager::FillNtupleTColumn(
        " value " + G4Analysis::ToString(value));
   }
 
+  // Creating ntuples on workers is triggered with the first FillColumn
+  // or AddRow (in only columns of vector type call)
+  CreateNtuplesIfNeeded();
+
   auto ntuple = GetNtupleInFunction(ntupleId, "FillNtupleTColumn");
-  if ( ! ntuple ) return false;
+  if (ntuple == nullptr) return false;
 
   auto index = columnId - fFirstNtupleColumnId;
   if ( index < 0 || index >= G4int(ntuple->columns().size()) ) {
@@ -62,7 +62,7 @@ inline G4bool G4RootPNtupleManager::FillNtupleTColumn(
 
   auto icolumn =  ntuple->columns()[index];
   auto column = dynamic_cast<tools::wroot::base_pntuple::column_string* >(icolumn);
-  if ( ! column ) {
+  if (column == nullptr) {
     G4Analysis::Warn(
       " Column type does not match: ntupleId " + to_string(ntupleId) +
       " columnId " + to_string(columnId) + " value " + value,
@@ -87,9 +87,9 @@ template <typename T>
 G4bool G4RootPNtupleManager::FillNtupleTColumn(
   G4int ntupleId, G4int columnId, const T& value)
 {
-  if (fCreateNtuples) {
-    CreateNtuplesFromMain();
-  }
+  // Creating ntuples on workers is triggered with the first FillColumn
+  // or AddRow (in only columns of vector type call)
+  CreateNtuplesIfNeeded();
 
   if ( fState.GetIsActivation() && ( ! GetActivation(ntupleId) ) ) {
     G4cout << "Skipping FillNtupleIColumn for " << ntupleId << G4endl;