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
@@ -29,6 +29,7 @@
 #include "G4AnalysisManagerState.hh"
 #include "G4HnManager.hh"
 #include "G4AnalysisUtilities.hh"
+#include "G4AutoLock.hh"

 #include <iostream>

@@ -135,6 +136,16 @@ void G4THnManager<T>::AddTVector(const std::vector<T*>& tVector)
 #endif
 }  

+//_____________________________________________________________________________
+template <typename T>
+void  G4THnManager<T>::Merge(
+  G4Mutex& mergeMutex, G4THnManager<T>* masterInstance)
+{
+  G4AutoLock lH1(&mergeMutex);
+  masterInstance->AddTVector(fTVector);
+  lH1.unlock();
+}
+
 //_____________________________________________________________________________
 template <typename T>
 typename std::vector<T*>::iterator G4THnManager<T>::BeginT()