From f1b642da716c3ad9b3470625ac0b9d039eb84c3d Mon Sep 17 00:00:00 2001
From: Elmar Ritsch <Elmar.Ritsch@cern.ch>
Date: Fri, 27 May 2016 12:51:33 +0200
Subject: [PATCH] back-port 'FullG4_LongLived' setup and make
'MC12G4_longLived' an alias of it for backward compatibility
(ISF_Config-00-02-03-02)
* python/ISF_MainConfig.py, python/ISF_ConfigConfigDb.py: back-port
'FullG4_LongLived' setup and make 'MC12G4_longLived' an alias of it for
backward compatibility
* tagging ISF_Config-00-02-03-02
Former-commit-id: 07c66fcb7cdd3ded0ba28c45fbecd5473f70453c
---
.../ISF_Config/python/ISF_ConfigConfigDb.py | 1 +
.../ISF/ISF_Config/python/ISF_MainConfig.py | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py b/Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py
index 00759283d66..c65ff6b13d0 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py
@@ -67,6 +67,7 @@ addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_MC12G4", "ISF_Ker
addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_MC12G4_longLived", "ISF_Kernel_MC12G4_longLived")
addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_PassBackG4", "ISF_Kernel_PassBackG4")
addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_FullG4", "ISF_Kernel_FullG4")
+addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_FullG4_LongLived", "ISF_Kernel_FullG4_LongLived")
addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_MC12G4_IDOnly", "ISF_Kernel_MC12G4_IDOnly")
addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_MC12G4_IDCalo", "ISF_Kernel_MC12G4_IDCalo")
addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_CosmicsG4", "ISF_Kernel_CosmicsG4")
diff --git a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
index 007d724f020..caa081592e9 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
@@ -226,6 +226,16 @@ def getKernel_GenericG4Only(name="ISF_Kernel_GenericG4Only", **kwargs):
def getKernel_FullG4(name="ISF_Kernel_FullG4", **kwargs):
return getKernel_GenericG4Only(name, **kwargs)
+############## Simulator: FullG4_LongLived ###############
+def getKernel_FullG4_LongLived(name="ISF_Kernel_MC12G4_LongLived", **kwargs):
+ kwargs.setdefault("BeamPipeSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
+ kwargs.setdefault("IDSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
+ kwargs.setdefault("CaloSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
+ kwargs.setdefault("MSSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
+ kwargs.setdefault("CavernSimulationSelectors" , [ 'ISF_DefaultParticleKillerSelector' ] )
+ kwargs.setdefault("ParticleBroker" , 'ISF_LongLivedParticleBrokerSvc' )
+ return getKernel_GenericG4Only(name, **kwargs)
+
############## Simulator: PassBackG4 ###############
def getKernel_PassBackG4(name="ISF_Kernel_PassBackG4", **kwargs):
kwargs.setdefault("ParticleBroker" , "ISF_ParticleBrokerSvcNoOrdering" )
@@ -244,13 +254,8 @@ def getKernel_CosmicsG4(name="ISF_Kernel_CosmicsG4", **kwargs):
############## Simulator: MC12G4_longLived ###############
def getKernel_MC12G4_longLived(name="ISF_Kernel_MC12G4_longLived", **kwargs):
- kwargs.setdefault("BeamPipeSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
- kwargs.setdefault("IDSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
- kwargs.setdefault("CaloSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
- kwargs.setdefault("MSSimulationSelectors" , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
- kwargs.setdefault("CavernSimulationSelectors" , [ 'ISF_DefaultParticleKillerSelector' ] )
- kwargs.setdefault("ParticleBroker" , 'ISF_LongLivedParticleBrokerSvc' )
- return getKernel_GenericG4Only(name, **kwargs)
+ # Legacy only
+ return getKernel_FullG4_LongLived(name, **kwargs)
############## Simulator: MC12G4 ###############
def getKernel_MC12G4(name="ISF_Kernel_MC12G4", **kwargs):
--
GitLab