diff --git a/Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py b/Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py index 00759283d665fe8d05dec568cbbb3446e47f5452..c65ff6b13d0f77502eee17d415e1e19396082afd 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 007d724f02090e8681af445472e8493d8fb5445f..caa081592e9d367a9535289df1f01074a41b11fc 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):