Import Geant4 10.7.0 source tree

2020-12-04 12:30:43 +01:00
parent 67ba86d073
commit dab42d2018
3770 changed files with 226369 additions and 286486 deletions
@@ -25,6 +25,7 @@
 //

 #include "G4HnManager.hh"
+#include "G4NtupleBookingManager.hh"
 #include "G4VH1Manager.hh"
 #include "G4VH2Manager.hh"
 #include "G4VH3Manager.hh"
@@ -713,8 +714,13 @@ G4bool G4VAnalysisManager::GetP2Plotting(G4int id) const
 inline 
 G4bool G4VAnalysisManager::GetNtupleActivation(G4int id) const
 {
-  return fVNtupleManager->GetActivation(id);
-}  
+  if ( fVNtupleManager ) {
+    return fVNtupleManager->GetActivation(id);
+  } else {
+    return fNtupleBookingManager->GetActivation(id);
+
+  }
+}

 //_____________________________________________________________________________
 inline