Import Geant4 10.5.0 source tree

source/analysis/root/src/G4RootAnalysisManager.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootAnalysisManager.cc 106985 2017-10-31 10:07:18Z gcosmo $
 
 // Author: Ivana Hrivnacova, 18/06/2013  (ivana@ipno.in2p3.fr)
 
@@ -80,7 +79,7 @@ G4bool G4RootAnalysisManager::IsInstance()
 G4RootAnalysisManager::G4RootAnalysisManager(G4bool isMaster)
  : G4ToolsAnalysisManager("Root", isMaster),
    fNofNtupleFiles(0),
-   fNtupleRowWise(true),
+   fNtupleRowWise(false),
    fNtupleMergeMode(G4NtupleMergeMode::kNone),
    fNtupleManager(nullptr),
    fSlaveNtupleManager(nullptr),
@@ -107,7 +106,7 @@ G4RootAnalysisManager::G4RootAnalysisManager(G4bool isMaster)
   // Merging may require user code migration as analysis manager
   // must be created both on master and workers.
   auto mergeNtuples = false;
-  SetNtupleMergingMode(mergeNtuples, fNofNtupleFiles);
+  SetNtupleMergingMode(mergeNtuples, fNofNtupleFiles, fNtupleRowWise);
 
   // Create ntuple managers
   CreateNtupleManagers();
@@ -126,7 +125,8 @@ G4RootAnalysisManager::~G4RootAnalysisManager()
 
 //_____________________________________________________________________________
 void G4RootAnalysisManager::SetNtupleMergingMode(G4bool mergeNtuples, 
-                                                 G4int nofNtupleFiles)
+                                                 G4int nofNtupleFiles,
+                                                 G4bool rowWise)
 
 {
 #ifdef G4VERBOSE
@@ -167,12 +167,12 @@ void G4RootAnalysisManager::SetNtupleMergingMode(G4bool mergeNtuples,
   G4String mergingMode;
   if ( ( ! mergeNtuples ) || ( ! canMerge ) ) {
     fNtupleMergeMode = G4NtupleMergeMode::kNone;
-    mergingMode = "G4NtupleMergeMode::kNone";      
+    mergingMode = "G4NtupleMergeMode::kNone";
   }
   else {
     // Set the number of reduced ntuple files
-    // G4int nofThreads = G4Threading::GetNumberOfThreads();
     fNofNtupleFiles = nofNtupleFiles;
+    fNtupleRowWise = rowWise;
   
     // Check the number of reduced ntuple files
     // if ( fNofNtupleFiles < 0 || fNofNtupleFiles > nofThreads ) {
@@ -260,7 +260,7 @@ void G4RootAnalysisManager::CreateNtupleManagers()
   switch ( fNtupleMergeMode )
   {
     case G4NtupleMergeMode::kNone:
-      fNtupleManager = new G4RootNtupleManager(fState);
+      fNtupleManager = new G4RootNtupleManager(fState, 0, fNtupleRowWise);
       fNtupleManager->SetFileManager(fFileManager);
       SetNtupleManager(fNtupleManager);
       break;
@@ -466,6 +466,22 @@ G4bool G4RootAnalysisManager::WriteNtuple()
   return finalResult;
 }
     
+//_____________________________________________________________________________
+G4bool G4RootAnalysisManager::ResetNtuple()
+{
+// Reset histograms and ntuple
+
+  auto finalResult = true;
+  
+  if ( fNtupleMergeMode == G4NtupleMergeMode::kNone || 
+       fNtupleMergeMode == G4NtupleMergeMode::kMain )  {
+    auto result = fNtupleManager->Reset(false);
+    finalResult = result && finalResult;
+  }  
+
+  return finalResult;
+}
+
 //_____________________________________________________________________________
 G4bool G4RootAnalysisManager::Reset()
 {
@@ -476,13 +492,8 @@ G4bool G4RootAnalysisManager::Reset()
   auto result = G4ToolsAnalysisManager::Reset();
   finalResult = finalResult && result;
   
-  if ( fNtupleMergeMode == G4NtupleMergeMode::kNone || 
-       fNtupleMergeMode == G4NtupleMergeMode::kMain )  {
-    result = fNtupleManager->Reset(false);
-    finalResult = result && finalResult;
-  }  
-
-  finalResult = finalResult && result;
+  result = ResetNtuple();
+  finalResult = result && finalResult;
   
   return finalResult;
 }
@@ -510,6 +521,7 @@ G4bool G4RootAnalysisManager::OpenFileImpl(const G4String& fileName)
     finalResult = finalResult && result;
     
     fNtupleManager->SetNtupleDirectory(fFileManager->GetNtupleDirectory());
+
     fNtupleManager->CreateNtuplesFromBooking();
 
 #ifdef G4VERBOSE
@@ -607,7 +619,7 @@ G4bool G4RootAnalysisManager::WriteImpl()
 }
 
 //_____________________________________________________________________________
-G4bool G4RootAnalysisManager::CloseFileImpl()
+G4bool G4RootAnalysisManager::CloseFileImpl(G4bool reset)
 {
   auto finalResult = true;
 
@@ -615,13 +627,18 @@ G4bool G4RootAnalysisManager::CloseFileImpl()
     // the ntuple decription vector is cleared on Reset()
     // in kNoMergeAfterOpen ntuple manager mode 
 
-  // reset data
-  auto result = Reset();
+  auto result = true;
+  if ( reset ) {
+    result = Reset();
+  } else {
+    // ntuple must be reset 
+    result = ResetNtuple();
+  }
   if ( ! result ) {
-      G4ExceptionDescription description;
-      description << "      " << "Resetting data failed";
-      G4Exception("G4RootAnalysisManager::Write()",
-                "Analysis_W021", JustWarning, description);
+    G4ExceptionDescription description;
+    description << "      " << "Resetting data failed";
+    G4Exception("G4RootAnalysisManager::CloseFile()",
+              "Analysis_W021", JustWarning, description);
   } 
   finalResult = finalResult && result;
 
@@ -672,10 +689,9 @@ void G4RootAnalysisManager::SetNtupleMerging(G4bool mergeNtuples,
 {
   // Keep basketSize in file manager
   fFileManager->SetBasketSize(basketSize);
-  fNtupleRowWise = rowWise;
 
   // Set ntuple merging mode 
-  SetNtupleMergingMode(mergeNtuples, nofNtupleFiles);
+  SetNtupleMergingMode(mergeNtuples, nofNtupleFiles, rowWise);
 
   // Clear existing managers
   ClearNtupleManagers();  
@@ -683,3 +699,19 @@ void G4RootAnalysisManager::SetNtupleMerging(G4bool mergeNtuples,
   // Re-create managers
   CreateNtupleManagers();
 }
+
+//_____________________________________________________________________________
+void G4RootAnalysisManager::SetNtupleRowWise(G4bool rowWise)
+{
+  // Do nothing if the mode is not changed
+  if ( fNtupleRowWise == rowWise ) return;
+
+  fNtupleRowWise = rowWise;
+
+  // Clear existing managers
+  ClearNtupleManagers();  
+
+  // Re-create managers
+  CreateNtupleManagers();
+}
+

source/analysis/root/src/G4RootAnalysisReader.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootAnalysisReader.cc 74257 2013-10-02 14:24:55Z gcosmo $
 
 // Author: Ivana Hrivnacova, 09/04/2014 (ivana@ipno.in2p3.fr)
 

source/analysis/root/src/G4RootFileManager.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootFileManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
 
 // Author: Ivana Hrivnacova, 15/06/2011  (ivana@ipno.in2p3.fr)
 

source/analysis/root/src/G4RootMainNtupleManager.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
 //
 // Author: Ivana Hrivnacova, 04/10/2016  (ivana@ipno.in2p3.fr)
 

source/analysis/root/src/G4RootNtupleManager.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootNtupleManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
 
 // Author: Ivana Hrivnacova, 18/06/2013  (ivana@ipno.in2p3.fr)
 
@@ -45,7 +44,8 @@ G4RootNtupleManager::G4RootNtupleManager(const G4AnalysisManagerState& state,
    fCreateMode(G4NtupleCreateMode::kUndefined),
    fFileManager(nullptr),
    fNtupleDirectory(nullptr),
-   fMainNtupleManagers()
+   fMainNtupleManagers(),
+   fRowWise(rowWise)
 {
   for ( G4int i=0; i<nofMainManagers; ++i) {
     fMainNtupleManagers.push_back(
@@ -64,7 +64,8 @@ G4RootNtupleManager::~G4RootNtupleManager()
 //_____________________________________________________________________________
 void G4RootNtupleManager::SetCreateMode()
 {
-// Set create mode if not yet defined
+// Set create mode if not yet defined, or reset it if ntuples are defined both
+// before and after open file 
 
 #ifdef G4VERBOSE
     if ( fState.GetVerboseL4() ) 
@@ -93,6 +94,18 @@ void G4RootNtupleManager::SetCreateMode()
       }
     }
   }
+  
+  if ( fCreateMode == G4NtupleCreateMode::kNoMergeBeforeOpen &&
+    fFileManager->GetNtupleFile(0) )  {
+    fCreateMode = G4NtupleCreateMode::kNoMergeAfterOpen;
+    createMode = "G4NtupleCreateMode::kNoMergeAfterOpen";
+  }
+
+  if ( fCreateMode == G4NtupleCreateMode::kMainBeforeOpen &&
+       fFileManager->GetNtupleFile(0) )  {
+    fCreateMode = G4NtupleCreateMode::kMainAfterOpen;
+    createMode = "G4NtupleCreateMode::kMainAfterOpen";
+  }
 
 #ifdef G4VERBOSE
     if ( fState.GetVerboseL2() ) 
@@ -116,7 +129,7 @@ void  G4RootNtupleManager::CreateTNtuple(
   
   ntupleDescription->fNtuple
     = new tools::wroot::ntuple(
-            *fNtupleDirectory, ntupleDescription->fNtupleBooking);
+            *fNtupleDirectory, ntupleDescription->fNtupleBooking, fRowWise);
   
   auto basketSize = fFileManager->GetBasketSize();
   ntupleDescription->fNtuple->set_basket_size(basketSize);
@@ -150,12 +163,15 @@ void G4RootNtupleManager::CreateTNtupleFromBooking(
 
 //_____________________________________________________________________________
 void G4RootNtupleManager::FinishTNtuple(
-  G4TNtupleDescription<tools::wroot::ntuple>* ntupleDescription)
+  G4TNtupleDescription<tools::wroot::ntuple>* ntupleDescription,
+  G4bool fromBooking)
 {
 // Create main ntuples
 
   // Set create mode if not yet defined
-  SetCreateMode();
+  if ( ! fromBooking ) {
+    SetCreateMode();
+  }
 
   // Create ntuple if file is open
   if ( fCreateMode == G4NtupleCreateMode::kNoMergeAfterOpen ) {

source/analysis/root/src/G4RootPNtupleManager.cc

@@ -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 

source/analysis/root/src/G4RootRFileManager.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootRFileManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
 
 // Author: Ivana Hrivnacova, 10/09/2014  (ivana@ipno.in2p3.fr)
 

source/analysis/root/src/G4RootRNtupleManager.cc

@@ -23,7 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootRNtupleManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
 
 // Author: Ivana Hrivnacova, 09/04/2014 (ivana@ipno.in2p3.fr)