Import Geant4 11.2.0 source tree

source/analysis/xml/include/G4XmlHnFileManager.icc

@@ -51,7 +51,9 @@ G4bool G4XmlHnFileManager<HT>::WriteExtra(
   // write histo
   auto result = tools::waxml::write(hnFile, *ht, path, htName);
   if ( ! result) {
-    // TO DO: give an exception about failure
+    G4Analysis::Warn(
+      "Saving " + G4Analysis::GetHnType<HT>() + " " + htName + " failed",
+      fkClass, "WriteExtra");
     return false;
   }
 

source/analysis/xml/sources.cmake

@@ -29,4 +29,4 @@ geant4_add_module(G4xml
 
 # EXPAT is a PUBLIC dependency by virtue of inclusion of tools/raxml
 # (No, it's not obvious!) and exposure of that in G4Xml{RFileManager/AnalysisReader}
-geant4_module_link_libraries(G4xml PUBLIC G4analysismng G4hntools G4globman G4tools ${EXPAT_LIBRARIES})
+geant4_module_link_libraries(G4xml PUBLIC G4analysismng G4hntools G4globman G4tools ${G4EXPAT_LIBRARIES})

source/analysis/xml/src/G4XmlNtupleManager.cc

@@ -57,7 +57,6 @@ void G4XmlNtupleManager::CreateTNtupleFromBooking(
       new tools::waxml::ntuple(
             *(ntupleDescription->GetFile()), G4cerr,
             ntupleDescription->GetNtupleBooking()));
-    fNtupleVector.push_back(ntupleDescription->GetNtuple());
 }
 
 //_____________________________________________________________________________