From 7f9b55a60b92dd384cecfca4893eb0b69153f310 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Tue, 29 Aug 2017 22:35:13 +0200
Subject: [PATCH] Update which SimFlag is used to set TruthService name
Prefer to use `simFlags.TruthStrategy.TruthServiceName()` rather than
`simFlags.TruthService.get_Value()` to set Truth Service name.
This should fix issues seen as part of ATLASSIM-3378
Former-commit-id: e1db4d08a6dc1bf821b412a3fb9043a37c24dfb3
---
.../G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py | 2 +-
Simulation/ISF/ISF_Config/python/ISF_MainConfig.py | 2 +-
.../python/ISF_FatrasServicesConfig.py | 14 +++++++-------
.../python/ISF_Geant4ToolsConfig.py | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
index 08495bec98e..f7868807bca 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
+++ b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
@@ -51,7 +51,7 @@ def getG4AtlasAlg(name='G4AtlasAlg', **kwargs):
is_hive = False
kwargs.setdefault('MultiThreading', is_hive)
- kwargs.setdefault('TruthRecordService', simFlags.TruthService.get_Value())
+ kwargs.setdefault('TruthRecordService', simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault('GeoIDSvc', 'ISF_GeoIDSvc')
## G4AtlasAlg verbosities (available domains = Navigator, Propagator, Tracking, Stepping, Stacking, Event)
diff --git a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
index 40cb0a21b7c..e13ab125ff1 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
@@ -186,7 +186,7 @@ def getKernel_GenericSimulator(name="ISF_Kernel_GenericSimulator", **kwargs):
kwargs.setdefault("InputConverter", "ISF_InputConverter")
kwargs.setdefault("ParticleBroker", "ISF_ParticleBrokerSvc")
from G4AtlasApps.SimFlags import simFlags
- kwargs.setdefault("TruthRecordService", simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordService", simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault("SimHitService", "ISF_SimHitService")
kwargs.setdefault("MemoryMonitoringTool", "ISF_MemoryMonitor")
kwargs.setdefault("DoCPUMonitoring", ISF_Flags.DoTimeMonitoring())
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
index 15f21a18bed..a9f6df91508 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
@@ -242,7 +242,7 @@ def getFatrasParticleDecayHelper(name="ISF_FatrasParticleDecayHelper", **kwargs)
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("G4RandomStreamName" , "FatrasG4") # TODO: read stream name "FatrasG4" from Fatras jobProperties
kwargs.setdefault("ParticleBroker" , getService('ISF_ParticleBrokerSvc'))
- kwargs.setdefault("ParticleTruthSvc", simFlags.TruthService.get_Value())
+ kwargs.setdefault("ParticleTruthSvc", simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault("PDGToG4ParticleConverter", getPublicTool('ISF_FatrasPdgG4Particle'))
# the validation output
kwargs.setdefault("ValidationMode" , ISF_Flags.ValidationMode())
@@ -266,7 +266,7 @@ def getFatrasG4HadIntProcessor(name="ISF_FatrasG4HadIntProcessor", **kwargs):
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , getService('ISF_ParticleBrokerSvc'))
- kwargs.setdefault("TruthRecordSvc" , simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault("PhysicsValidationTool" , getPublicTool('ISF_FatrasPhysicsValidationTool'))
kwargs.setdefault('ValidationMode' , ISF_Flags.ValidationMode())
kwargs.setdefault("MomentumCut" , FatrasTuningFlags.MomCutOffSec())
@@ -281,7 +281,7 @@ def getFatrasParametricHadIntProcessor(name="ISF_FatrasParametricHadIntProcessor
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , getService('ISF_ParticleBrokerSvc'))
- kwargs.setdefault("TruthRecordSvc" , simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault("HadronicInteractionScaleFactor" , FatrasTuningFlags.HadronicInteractionProbabilityScalor())
kwargs.setdefault("MinimumHadronicInitialEnergy" , FatrasTuningFlags.MomCutOffSec())
kwargs.setdefault("MinimumHadronicOutEnergy" , FatrasTuningFlags.MomCutOffSec())
@@ -302,7 +302,7 @@ def getFatrasConversionCreator(name="ISF_FatrasConversionCreator", **kwargs):
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , getService('ISF_ParticleBrokerSvc'))
- kwargs.setdefault("TruthRecordSvc" , simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault("PhysicsValidationTool" , getPublicTool('ISF_FatrasPhysicsValidationTool'))
kwargs.setdefault("PhysicsProcessCode" , 14) # TODO: to be taken from central definition
kwargs.setdefault('ValidationMode' , ISF_Flags.ValidationMode())
@@ -316,7 +316,7 @@ def getFatrasProcessSamplingTool(name="ISF_FatrasProcessSamplingTool", **kwargs)
from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault( "RandomNumberService", simFlags.RandomSvc())
# truth record
- kwargs.setdefault("TruthRecordSvc" , simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
# decays
kwargs.setdefault("ParticleDecayHelper" , getPublicTool('ISF_FatrasParticleDecayHelper'))
# photon conversion
@@ -402,7 +402,7 @@ def getFatrasMaterialUpdator(name="ISF_FatrasMaterialUpdator", **kwargs):
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , getService('ISF_ParticleBrokerSvc'))
- kwargs.setdefault("TruthRecordSvc" , simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
# hadronic interactions
kwargs.setdefault("HadronicInteraction" , True)
#kwargs.setdefault("HadronicInteractionProcessor", getPublicTool('ISF_FatrasParametricHadIntProcessor'))
@@ -438,7 +438,7 @@ def getFatrasMaterialEffectsEngine(name="ISF_FatrasMaterialEffectsEngine", **kwa
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , getService('ISF_ParticleBrokerSvc'))
- kwargs.setdefault("TruthRecordSvc" , simFlags.TruthService.get_Value())
+ kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
kwargs.setdefault("ProcessSamplingTool" , getPublicTool('ISF_FatrasProcessSamplingTool'))
kwargs.setdefault("ParticleDecayHelper" , getPublicTool('ISF_FatrasParticleDecayHelper'))
# energy loss
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
index 087fe518e96..ff4eab490d7 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
@@ -7,7 +7,7 @@ from AthenaCommon import CfgMgr
def getMCTruthUserActionTool(name='ISFMCTruthUserActionTool', **kwargs):
from G4AtlasApps.SimFlags import simFlags
- kwargs.setdefault('TruthRecordSvc', simFlags.TruthService.get_Value())
+ kwargs.setdefault('TruthRecordSvc', simFlags.TruthStrategy.TruthServiceName())
return CfgMgr.G4UA__iGeant4__MCTruthUserActionTool(name, **kwargs)
def addMCTruthUserActionTool(name="ISFMCTruthUserActionTool",system=False):
--
GitLab