Import Geant4 11.2.1 source tree

source/run/History

@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-12-13 Ben Morgan (run-V11-01-11)
+- Fix Issue #86: report number of threads from G4TaskRunManager correctly.
+
 ## 2023-11-17 I. Hrivnacova (run-V11-01-10)
 - Do not call G4ParticleTable::WorkerG4ParticleTable() in
   G4WorkerRunManager constructor as this function

source/run/include/G4TaskRunManager.hh

@@ -101,7 +101,7 @@ class G4TaskRunManager : public G4MTRunManager, public PTL::TaskRunManager
     inline G4int GetNumberOfEventsPerTask() const { return numberOfEventsPerTask; }
 
     void SetNumberOfThreads(G4int n) override;
-    G4int GetNumberOfThreads() const override { return PTL::TaskRunManager::GetNumberOfThreads(); }
+    G4int GetNumberOfThreads() const override;
     size_t GetNumberActiveThreads() const override
     {
       return PTL::TaskRunManager::GetNumberActiveThreads();

source/run/src/G4TaskRunManager.cc

@@ -212,6 +212,15 @@ void G4TaskRunManager::SetNumberOfThreads(G4int n)
 
 //============================================================================//
 
+G4int G4TaskRunManager::GetNumberOfThreads() const
+{
+  // If the ThreadPool isn't initialized, it will return 0 even if we've already
+  // set nworkers
+  return poolInitialized ? PTL::TaskRunManager::GetNumberOfThreads() : nworkers;
+}
+
+//============================================================================//
+
 void G4TaskRunManager::Initialize()
 {
   G4bool firstTime = (threadPool == nullptr);