Import Geant4 10.3.0 source tree

2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
@@ -34,7 +34,7 @@ inline
 tools::aida::ntuple* G4XmlAnalysisReader::GetNtuple() const
 {
  //return fNtupleManager->GetNtuple();
-  return 0;
+  return nullptr;
 }  

 //_____________________________________________________________________________
@@ -42,5 +42,5 @@ inline
 tools::aida::ntuple* G4XmlAnalysisReader::GetNtuple(G4int /*ntupleId*/) const
 {
  //return fNtupleManager->GetNtuple(ntupleId);
-  return 0;
+  return nullptr;
 }  
@@ -90,6 +90,8 @@ void G4XmlNtupleManager::CreateTNtupleFromBooking(
 void G4XmlNtupleManager::FinishTNtuple(
  G4TNtupleDescription<tools::waxml::ntuple>* ntupleDescription)
 {
+  if ( ! ntupleDescription->fNtuple ) return;
+
  G4String path = "/";
  path.append(fFileManager->GetNtupleDirectoryName());
  ntupleDescription->fNtuple