Import Geant4 10.7.0.beta source tree

2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
@@ -399,8 +399,9 @@ G4bool G4RootPNtupleManager::Merge()
  for ( auto ntupleDescription : fNtupleDescriptionVector) {

    // skip inactivated ntuples
-    if ( ! ntupleDescription->fActivation ) continue;
-  
+    if(!ntupleDescription->fActivation || !ntupleDescription->fNtuple)
+      continue;
+
 #ifdef G4VERBOSE
    if ( fState.GetVerboseL4() ) {
      fState.GetVerboseL4()