Import Geant4 10.6.0 source tree

2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
@@ -37,7 +37,7 @@


 G4MPIntupleMerger::G4MPIntupleMerger(G4int nofReducedNtupleFiles,
-                                     G4bool rowWise)
+                                     G4bool rowWise, G4bool rowMode)
 {
  // Configure MPI using  G4MPImanager

@@ -59,7 +59,8 @@ G4MPIntupleMerger::G4MPIntupleMerger(G4int nofReducedNtupleFiles,
  fWrmpi = new tools::mpi::wrmpi(G4cout, *comm);

  analysisManager->SetMpiNtupleMerging(
-    fWrmpi, mpiRank, mpiSize, nofReducedNtupleFiles, rowWise);
+    fWrmpi, mpiRank, mpiSize, nofReducedNtupleFiles);
+  analysisManager->SetNtupleRowWise(rowWise, rowMode);

  // G4cout << "End configure ntuple MPI merging" << G4endl;
 }