Import Geant4 11.3.1 source tree

source/run/History

@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2025-02-25 John Apostolakis (run-V11-02-27)
+- Correct when G4WorkerRunManager's InitializeGeometry calls G4GeometryManager's 
+  UndertakeOptimisation to contribute to parallel voxelisation.
+
 ## 2024-11-08 Laurent Desorgher (run-V11-02-26)
 - Change of G4AdjointSimManager G4AdjointSimMessenger to allow AdjointSimulation 
 in MT mode.

source/run/src/G4WorkerRunManager.cc

@@ -146,8 +146,8 @@ void G4WorkerRunManager::InitializeGeometry()
 
   // Step 0: Contribute to the voxelisation of the geometry
   G4GeometryManager* geomManager = G4GeometryManager::GetInstance();
-  if( geomManager->IsParallelOptimisationConfigured() ) {
-    G4cout << "G4RunManager::InitializeGeometry calling GeometryManager's UndertakeOptimisation" 
+  if( geomManager->IsParallelOptimisationConfigured() && ! geomManager->IsParallelOptimisationFinished() ) {
+    G4cout << "G4RunManager::InitializeGeometry calling GeometryManager's UndertakeOptimisation"
            << G4endl;  // TODO - suppress / delete this in final version
     geomManager->UndertakeOptimisation();
   }