Merge pull request #3 from murnanedaniel/ddsim-mt-pr-fixes

Remove elif leading to recursion and change shared check strategy

Author: wdconinc

DDG4/python/DDG4.py

@@ -157,8 +157,6 @@ def _getKernelProperty(self, name):
     return _evalProperty(ret.data)
   elif hasattr(self.get(), name):
     return _evalProperty(getattr(self.get(), name))
-  elif hasattr(self, name):
-    return _evalProperty(getattr(self, name))
   msg = 'Geant4Kernel::GetProperty [Unhandled]: Cannot access Kernel.' + name
   raise KeyError(msg)
 

DDG4/python/DDSim/DD4hepSimulation.py

@@ -337,7 +337,9 @@ def __setupActions(self, kernel):
   def __setupGeneratorActions(self, kernel, geant4):
     import DDG4
 
-    shared = (kernel.RunManagerType == "G4MTRunManager")
+    # Determine 'shared' based on the overall setting, not the worker kernel property
+    shared = (self.numberOfThreads > 1)
+    logger.debug(f"Determined shared={shared} based on self.numberOfThreads={self.numberOfThreads}")
 
     actionList = []
 
@@ -844,7 +846,8 @@ def _buildInputStage(self, geant4, generator_input_modules, output_level=None, h
     ga = geant4.kernel().generatorAction()
 
     # Register Generation initialization action
-    shared = (geant4.kernel().RunManagerType == "G4MTRunManager")
+    shared = (self.numberOfThreads > 1)
+    logger.debug(f"Determined shared={shared} based on self.numberOfThreads={self.numberOfThreads}")
     gen = GeneratorAction(geant4.kernel(), "Geant4GeneratorActionInit/GenerationInit", shared = shared)
     generationInit = gen
     if output_level is not None: