Import Geant4 10.6.0.beta source tree

source/analysis/History

@@ -16,7 +16,10 @@ committal in the SVN repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-March 11, 2019 G. Cosmo (analysis-V10-04-11)
+June 12, 2019 I. Hrivnacova (analysis-V10-05-01)
+- Fixed CSV, XML ntuple file names
+
+March 11, 2019 G. Cosmo (analysis-V10-05-00)
 - Fixed typos in printouts in G4P1Messenger, G4PlotMessenger, G4PlotParameters.
 
 November 28, 2018 I. Hrivnacova (analysis-V10-04-10)

source/analysis/csv/src/G4CsvNtupleManager.cc

@@ -94,6 +94,11 @@ void G4CsvNtupleManager::FinishTNtuple(
   G4TNtupleDescription<tools::wcsv::ntuple>* ntupleDescription,
   G4bool /*fromBooking*/)
 {
+
+  // Do nothing if the base file name was not yet defined
+  if ( ! fFileManager->GetFileName().size() ) return;
+
+  // Create ntuple from booking
   if ( ! ntupleDescription->fNtuple ) {
     CreateTNtupleFromBooking(ntupleDescription);
   }

source/analysis/xml/src/G4XmlNtupleManager.cc

@@ -91,10 +91,15 @@ void G4XmlNtupleManager::FinishTNtuple(
   G4bool /*fromBooking*/)
 
 {
+  // Do nothing if the base file name was not yet defined
+  if ( ! fFileManager->GetFileName().size() ) return;
+
+  // Create ntuple from booking
   if ( ! ntupleDescription->fNtuple ) {
     CreateTNtupleFromBooking(ntupleDescription);
   }
 
+  // Write header
   G4String path = "/";
   path.append(fFileManager->GetNtupleDirectoryName());
   ntupleDescription->fNtuple