Merge branch 'ISF_ParticleFinalStateFilter_ATLASSIM-3634_21.0' into '21.0'

Move all configuration for ISF_ParticleFinalStateFilter into the CfgGetter method

See merge request atlas/athena!10423

Former-commit-id: 3924bc802f57afc6ba8516c7c7f59a3005e3ab2a

Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/iGeant4.py

@@ -44,13 +44,6 @@ class iGeant4:
     svcMgr += Geant4SimService
     self.__simSvc__ = Geant4SimService
 
-    ##FIXME: ISF_ParticleFinalStateFilter is configured in
-    ##ISF_HepMC_ToolsConfig.py and is only used by ISF_StackFiller
-    ##which is also configured in ISF_HepMC_ToolsConfig.py.
-    finalStateFilter = getPublicTool("ISF_ParticleFinalStateFilter")
-    finalStateFilter.CheckGenSimStable = False
-    finalStateFilter.CheckGenInteracting = False
-
     ####################################
     ##
     ## the G4 Python part:

Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py

@@ -13,9 +13,13 @@ from AthenaCommon.SystemOfUnits import MeV, mm
 ## GenParticleFilters
 
 def getParticleFinalStateFilter(name="ISF_ParticleFinalStateFilter", **kwargs):
-    # ParticleFinalStateFilter
+    from ISF_Config.ISF_jobProperties import ISF_Flags
+    G4NotInUse = not ISF_Flags.UsingGeant4.get_Value()
+    from G4AtlasApps.SimFlags import simFlags
+    G4NotInUse = G4NotInUse and simFlags.ISFRun.get_Value()
     # use CheckGenInteracting==False to allow GenEvent neutrinos to propagate into the simulation
-    #kwargs.setdefault("CheckGenInteracting"     , False )
+    kwargs.setdefault("CheckGenSimStable", G4NotInUse)
+    kwargs.setdefault("CheckGenInteracting", G4NotInUse)
     return CfgMgr.ISF__GenParticleFinalStateFilter(name, **kwargs)
 
 def getParticleSimWhiteList(name="ISF_ParticleSimWhiteList", **kwargs):