lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.5.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-12-07 15:15:39 +01:00
parent 6aa23be517
commit db49709b53
11370 changed files with 187480 additions and 160142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/root/src/G4RootPNtupleManager.cc
+4 -6
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id$
//
// Author: Ivana Hrivnacova, 04/10/2016 (ivana@ipno.in2p3.fr)
@@ -36,9 +35,8 @@
// mutex in a file scope
namespace {
//Mutex to lock master manager when adding ntuple row
G4Mutex addRowMutex = G4MUTEX_INITIALIZER;
G4Mutex endFillMutex = G4MUTEX_INITIALIZER;
//Mutex to lock master manager when adding ntuple row and ending fill
G4Mutex pntupleMutex = G4MUTEX_INITIALIZER;
}
//_____________________________________________________________________________
@@ -366,7 +364,7 @@ G4bool G4RootPNtupleManager::AddNtupleRow(G4int ntupleId)
auto ntupleDescription = GetNtupleDescriptionInFunction(ntupleId, "AddNtupleRow");
if ( ! ntupleDescription ) return false;
G4AutoLock lock(&addRowMutex);
G4AutoLock lock(&pntupleMutex);
lock.unlock();
mutex toolsLock(lock);
auto result
@@ -407,7 +405,7 @@ G4bool G4RootPNtupleManager::Merge()
}
#endif
G4AutoLock lock(&endFillMutex);
G4AutoLock lock(&pntupleMutex);
lock.unlock();
mutex toolsLock(lock);
auto result