diff --git a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigLegacy.py b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigLegacy.py
index 590df4dff3323d4f1feeee72601963077906cab1..2d44fd23f0ab39b2d2d0659d412715dc795c0ead 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigLegacy.py
+++ b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigLegacy.py
@@ -46,7 +46,6 @@ def getG4AtlasAlg(name='G4AtlasAlg', **kwargs):
from ISF_Config.ISF_jobProperties import ISF_Flags
if ISF_Flags.Simulator.isQuasiStable():
- kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
kwargs.setdefault('QuasiStablePatcher', 'ZeroLifetimePositioner')
## 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 a4635b659d84bec6ac74b8c87161b5558c0ac91d..3cab7758b4d837e48022c89c5ba9d3b4be989829 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
@@ -8,7 +8,7 @@ from SimulationConfig.SimulationMetadata import writeSimulationParametersMetadat
from ISF_Services.ISF_ServicesCoreConfig import GeoIDSvcCfg
from ISF_Services.ISF_ServicesConfig import (
InputConverterCfg, TruthServiceCfg,
- LongLivedInputConverterCfg, AFIIParticleBrokerSvcCfg
+ AFIIParticleBrokerSvcCfg
)
from ISF_Tools.ISF_ToolsConfig import (
ParticleKillerToolCfg, EnergyParticleOrderingToolCfg,
@@ -39,9 +39,7 @@ from ISF_SimulationSelectors.ISF_SimulationSelectorsConfig import (
)
from ISF_Geant4Tools.ISF_Geant4ToolsConfig import (
AFIIGeant4ToolCfg,
- AFII_QS_Geant4ToolCfg,
FullGeant4ToolCfg,
- LongLivedGeant4ToolCfg,
PassBackGeant4ToolCfg,
)
from ISF_Geant4CommonTools.ISF_Geant4CommonToolsConfig import (
@@ -90,9 +88,7 @@ def Kernel_GenericSimulatorMTCfg(flags, name="ISF_Kernel_GenericSimulatorMT", **
if "QuasiStablePatcher" not in kwargs:
from BeamEffects.BeamEffectsAlgConfig import ZeroLifetimePositionerCfg
kwargs.setdefault("QuasiStablePatcher", acc.getPrimaryAndMerge(ZeroLifetimePositionerCfg(flags)))
- if "InputConverter" not in kwargs:
- kwargs.setdefault("InputConverter", acc.getPrimaryAndMerge(LongLivedInputConverterCfg(flags)).name)
- elif "InputConverter" not in kwargs:
+ if "InputConverter" not in kwargs:
kwargs.setdefault("InputConverter", acc.getPrimaryAndMerge(InputConverterCfg(flags)).name)
if flags.Sim.ISF.ReSimulation:
@@ -146,8 +142,8 @@ def Kernel_FullG4MT_QSCfg(flags, name="ISF_Kernel_FullG4MT_QS", **kwargs):
kwargs.setdefault("SimulationTools", [
acc.popToolsAndMerge(ParticleKillerToolCfg(flags)),
- acc.popToolsAndMerge(LongLivedGeant4ToolCfg(flags))
- ])
+ acc.popToolsAndMerge(FullGeant4ToolCfg(flags))
+ ]) #private ToolHandleArray
acc.merge(Kernel_GenericG4OnlyMTCfg(flags, name, **kwargs))
return acc
@@ -257,7 +253,7 @@ def Kernel_ATLFAST3MT_QSCfg(flags, name="ISF_Kernel_ATLFAST3MT_QS", **kwargs):
from ISF_FastCaloSimServices.ISF_FastCaloSimServicesConfig import FastCaloSimV2ToolCfg
kwargs.setdefault("SimulationTools", [ acc.popToolsAndMerge(ParticleKillerToolCfg(flags)),
acc.popToolsAndMerge(FastCaloSimV2ToolCfg(flags)),
- acc.popToolsAndMerge(AFII_QS_Geant4ToolCfg(flags)) ])
+ acc.popToolsAndMerge(AFIIGeant4ToolCfg(flags)) ])
acc.merge(Kernel_GenericSimulatorMTCfg(flags, name, **kwargs))
return acc
@@ -282,9 +278,7 @@ def Kernel_GenericSimulatorCfg(flags, name="ISF_Kernel_GenericSimulator", **kwar
if "QuasiStablePatcher" not in kwargs:
from BeamEffects.BeamEffectsAlgConfig import ZeroLifetimePositionerCfg
kwargs.setdefault("QuasiStablePatcher", acc.getPrimaryAndMerge(ZeroLifetimePositionerCfg(flags)) )
- if "InputConverter" not in kwargs:
- kwargs.setdefault("InputConverter", acc.getPrimaryAndMerge(LongLivedInputConverterCfg(flags)).name)
- elif "InputConverter" not in kwargs:
+ if "InputConverter" not in kwargs:
kwargs.setdefault("InputConverter", acc.getPrimaryAndMerge(InputConverterCfg(flags)).name)
kwargs.setdefault("InputHardScatterCollection", "BeamTruthEvent")
diff --git a/Simulation/ISF/ISF_Config/python/ISF_MainConfigLegacy.py b/Simulation/ISF/ISF_Config/python/ISF_MainConfigLegacy.py
index 5e1614634ac5a63845d68d494c0b22b94371fdb3..a8b7fe57265a4903ac8cc5d6832b47036fabe56d 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_MainConfigLegacy.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfigLegacy.py
@@ -181,7 +181,6 @@ def getKernel_GenericSimulator(name="ISF_Kernel_GenericSimulator", **kwargs):
kwargs.setdefault("InputHardScatterCollection", "BeamTruthEvent")
kwargs.setdefault("OutputHardScatterTruthCollection", "TruthEvent")
if ISF_Flags.Simulator.isQuasiStable():
- kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
kwargs.setdefault('QuasiStablePatcher', 'ZeroLifetimePositioner')
kwargs.setdefault('InputConverter', 'ISF_InputConverter')
kwargs.setdefault("ParticleBroker", ISF_Flags.ParticleBroker())
@@ -205,7 +204,6 @@ def getKernel_GenericSimulatorMT(name="ISF_Kernel_GenericSimulatorMT", **kwargs)
kwargs.setdefault("OutputTruthCollection", "TruthEvent" )
kwargs.setdefault("GeoIDSvc", "ISF_GeoIDSvc" )
if ISF_Flags.Simulator.isQuasiStable():
- kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
kwargs.setdefault('QuasiStablePatcher', 'ZeroLifetimePositioner')
kwargs.setdefault('InputConverter', 'ISF_InputConverter')
@@ -309,7 +307,7 @@ def getKernel_FullG4_LongLived(name="ISF_Kernel_FullG4_LongLived", **kwargs): #
############## Simulator: FullG4MT_QS ###############
def getKernel_FullG4MT_QS(name="ISF_Kernel_FullG4MT_QS", **kwargs):
kwargs.setdefault("SimulationTools", ["ISF_ParticleKillerTool",
- "ISF_LongLivedGeant4Tool"])
+ "ISF_FullGeant4Tool"])
return getKernel_GenericG4OnlyMT(name, **kwargs)
############## Simulator: FullG4MT_longLived ###############
@@ -442,7 +440,7 @@ def getKernel_ATLFAST3MT_QS(name="ISF_Kernel_ATLFAST3MT_QS", **kwargs):
kwargs.setdefault("CavernSimulationSelectors" , [ 'ISF_DefaultParticleKillerSelector' ] )
kwargs.setdefault("SimulationTools" , [ 'ISF_ParticleKillerTool',
'ISF_FastCaloSimV2Tool',
- 'AFII_QS_Geant4Tool'])
+ 'ISF_AFIIGeant4Tool'])
kwargs.setdefault("ParticleOrderingTool" , 'ISF_ParticleOrderingTool' )
kwargs.setdefault('EntryLayerTool' , 'ISF_AFIIEntryLayerToolMT')
from G4AtlasApps.SimFlags import simFlags
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfig.py b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfig.py
index 9afe4b91c6b5037963ea2f30599194443fea9a22..3c514850e2b7dc58b2c8a1b4b51ead497df130b1 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfig.py
+++ b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfig.py
@@ -1,6 +1,6 @@
"""ComponentAccumulator service configuration for ISF
-Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -42,13 +42,6 @@ def InputConverterCfg(flags, name="ISF_InputConverter", **kwargs):
return result
-def LongLivedInputConverterCfg(flags, name="ISF_LongLivedInputConverter", **kwargs):
- result = ComponentAccumulator()
- inptCnv = result.getPrimaryAndMerge(InputConverterCfg(flags, name, **kwargs))
- result.addService(inptCnv, primary = True)
- return result
-
-
def ParticleBrokerSvcNoOrderingCfg(flags, name="ISF_ParticleBrokerSvcNoOrdering", **kwargs):
result = ComponentAccumulator()
if "EntryLayerTool" not in kwargs:
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigDb.py b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigDb.py
index a7fbfd1434859bf1e07a6fbbd588eed18c79fc7c..a05563ea78d1b5171b6b79e3cb13fecb11d9fdfb 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigDb.py
+++ b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigDb.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
Configuration database for ISF_Services
@@ -17,7 +17,6 @@ addService("ISF_Services.ISF_ServicesConfigLegacy.getParticleBrokerSvcNoOrdering
addService("ISF_Services.ISF_ServicesConfigLegacy.getAFIIParticleBrokerSvc", "ISF_AFIIParticleBrokerSvc")
addService("ISF_Services.ISF_ServicesConfigLegacy.getAFIIEnergyOrderedParticleBrokerSvc", "ISF_AFIIEnergyOrderedParticleBrokerSvc")
addService("ISF_Services.ISF_ServicesConfigLegacy.getInputConverter", "ISF_InputConverter")
-addService("ISF_Services.ISF_ServicesConfigLegacy.getLongLivedInputConverter", "ISF_LongLivedInputConverter")
addService("ISF_Services.ISF_ServicesConfigLegacy.getTruthService", "ISF_TruthService")
addService("ISF_Services.ISF_ServicesConfigLegacy.getMC12TruthService", "ISF_MC12TruthService")
addService("ISF_Services.ISF_ServicesConfigLegacy.getMC12PlusTruthService", "ISF_MC12PlusTruthService")
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigLegacy.py b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigLegacy.py
index c0769ef940551c19e019135c34f475e7bf0a8e24..123e1575f177629f2e444aeb2f791cc3b58cce06 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigLegacy.py
+++ b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigLegacy.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
Service configurations for ISF
@@ -67,21 +67,13 @@ def getInputConverter(name="ISF_InputConverter", **kwargs):
from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("UseShadowEvent", simFlags.UseShadowEvent())
kwargs.setdefault("UseGeneratedParticleMass", False)
+ from ISF_Config.ISF_jobProperties import ISF_Flags
from ISF_HepMC_Tools.ISF_HepMC_ToolsConfigLegacy import getGenParticleFilters
- kwargs.setdefault("GenParticleFilters", getGenParticleFilters())
+ kwargs.setdefault("GenParticleFilters", getGenParticleFilters(ISF_Flags.Simulator.isQuasiStable()))
+ kwargs.setdefault('QuasiStableParticlesIncluded', ISF_Flags.Simulator.isQuasiStable())
return CfgMgr.ISF__InputConverter(name, **kwargs)
-def getLongLivedInputConverter(name="ISF_LongLivedInputConverter", **kwargs):
- from G4AtlasApps.SimFlags import simFlags
- kwargs.setdefault("GenParticleFilters" , [ simFlags.ParticleSimAcceptList.get_Value(),
- 'ISF_ParticlePositionFilterDynamic',
- 'ISF_EtaPhiFilter',
- 'ISF_GenParticleInteractingFilter', ] )
- kwargs.setdefault('QuasiStableParticlesIncluded', True)
- return getInputConverter(name, **kwargs)
-
-
#
# Generic Truth Service Configurations
#
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfig.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfig.py
index 669bdea169e4710e3468bfd84660724fb9bd5bbe..8e654461442e0260f683c220eb3b718d7ab739f6 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfig.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfig.py
@@ -1,13 +1,13 @@
"""Geant4 services config for ISF with ComponentAccumulator
-Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import LHCPeriod
from ISF_Geant4Tools.ISF_Geant4ToolsConfig import (
Geant4ToolCfg, FullGeant4ToolCfg, PassBackGeant4ToolCfg,
- AFIIGeant4ToolCfg, AFII_QS_Geant4ToolCfg
+ AFIIGeant4ToolCfg
)
@@ -57,7 +57,7 @@ def AFIIGeant4SimCfg(flags, name="ISF_AFIIGeant4SimSvc", **kwargs):
def AFII_QS_Geant4SimCfg(flags, name="ISF_AFII_QS_Geant4SimSvc", **kwargs):
result = ComponentAccumulator()
- kwargs.setdefault("SimulatorTool", result.addPublicTool(result.popToolsAndMerge(AFII_QS_Geant4ToolCfg(flags))))
+ kwargs.setdefault("SimulatorTool", result.addPublicTool(result.popToolsAndMerge(AFIIGeant4ToolCfg(flags))))
svc = result.getPrimaryAndMerge(PassBackGeant4SimCfg(flags, name, **kwargs))
result.addService(svc, primary = True)
return result
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigLegacy.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigLegacy.py
index 860bafb59c4ff35abbca4fe33ec3cd0d0f7ba0f0..9aa71cfd589e946e569221bb45c91b94d9deff1e 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigLegacy.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigLegacy.py
@@ -43,7 +43,7 @@ def getFullGeant4SimSvc(name="ISF_FullGeant4SimSvc", **kwargs):
return getGeant4SimSvc(name, **kwargs)
def getLongLivedGeant4SimSvc(name="ISF_LongLivedGeant4SimSvc", **kwargs):
- kwargs.setdefault('SimulatorTool' , 'ISF_LongLivedGeant4Tool')
+ kwargs.setdefault('SimulatorTool' , 'ISF_FullGeant4Tool')
return getFullGeant4SimSvc(name, **kwargs)
def getPassBackGeant4SimSvc(name="ISF_PassBackGeant4SimSvc", **kwargs):
@@ -56,5 +56,5 @@ def getAFIIGeant4SimSvc(name="ISF_AFIIGeant4SimSvc", **kwargs):
return getPassBackGeant4SimSvc(name, **kwargs)
def getAFII_QS_Geant4SimSvc(name="ISF_AFII_QS_Geant4SimSvc", **kwargs):
- kwargs.setdefault('SimulatorTool' , 'AFII_QS_Geant4Tool')
+ kwargs.setdefault('SimulatorTool' , 'ISF_AFIIGeant4Tool')
return getPassBackGeant4SimSvc(name, **kwargs)
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 88769740ebeb93f0a06c9b751667fec1cff027b8..9828dac5b3b8ff2a43a06813eeac5408eacd8cdb 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
@@ -1,6 +1,6 @@
"""Geant4 tools config for ISF with ComponentAccumulator
-Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -16,7 +16,7 @@ from G4AtlasTools.G4AtlasToolsConfig import (
SensitiveDetectorMasterToolCfg, FastSimulationMasterToolCfg
)
from ISF_Services.ISF_ServicesConfig import (
- InputConverterCfg, LongLivedInputConverterCfg
+ InputConverterCfg
)
@@ -79,25 +79,9 @@ def PassBackGeant4ToolCfg(flags, name="ISF_PassBackGeant4Tool", **kwargs):
return acc
-def AFIIGeant4ToolCfg(flags, name="ISF_AFIIGeant4Tool", **kwargs):
+def AFIIGeant4ToolCfg(flags, name="ISF_AFIIGeant4Tool", **kwargs): # TODO Rename
acc = ComponentAccumulator()
kwargs.setdefault("UserActionSvc", acc.getPrimaryAndMerge(ISF_AFIIUserActionSvcCfg(flags)).name)
PassBackGeant4Tool = acc.popToolsAndMerge(Geant4ToolCfg(flags, name, **kwargs))
acc.setPrivateTools(PassBackGeant4Tool)
return acc
-
-
-def LongLivedGeant4ToolCfg(flags, name="ISF_LongLivedGeant4Tool", **kwargs):
- acc = ComponentAccumulator()
- kwargs.setdefault("InputConverter", acc.getPrimaryAndMerge(LongLivedInputConverterCfg(flags)).name)
- FullGeant4Tool = acc.popToolsAndMerge(FullGeant4ToolCfg(flags, name, **kwargs))
- acc.setPrivateTools(FullGeant4Tool)
- return acc
-
-
-def AFII_QS_Geant4ToolCfg(flags, name="AFII_QS_Geant4Tool", **kwargs):
- acc = ComponentAccumulator()
- kwargs.setdefault("InputConverter", acc.getPrimaryAndMerge(LongLivedInputConverterCfg(flags)).name)
- AFIIGeant4Tool = acc.popToolsAndMerge(AFIIGeant4ToolCfg(flags, name, **kwargs))
- acc.setPrivateTools(AFIIGeant4Tool)
- return acc
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigDb.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigDb.py
index 92a600b9665dbd8336c6b229f1103c4da3c3cfaf..39aa305fa9e4d4fb301b088d87e9713275a8c6c1 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigDb.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigDb.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CfgGetter import addTool
@@ -13,7 +13,5 @@ addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getAFII_G4TrackProcessorUse
addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getGeant4Tool", "ISF_Geant4Tool")
addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getFullGeant4Tool", "ISF_FullGeant4Tool")
-addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getLongLivedGeant4Tool", "ISF_LongLivedGeant4Tool")
addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getPassBackGeant4Tool", "ISF_PassBackGeant4Tool")
addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getAFIIGeant4Tool", "ISF_AFIIGeant4Tool")
-addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfigLegacy.getAFII_QS_Geant4Tool", "AFII_QS_Geant4Tool")
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigLegacy.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigLegacy.py
index b44db3ea14313bed7dea89ba8ad1a50a486cc09e..1a0099d1be42ec9322a607a8bac66a26a0b37bd3 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigLegacy.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigLegacy.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
## -----------------------------------------------------------------------------
### Base Version
@@ -103,16 +103,8 @@ def getPassBackGeant4Tool(name="ISF_PassBackGeant4Tool", **kwargs):
kwargs.setdefault('UserActionSvc','G4UA::ISFPassBackUserActionSvc')
return getGeant4Tool(name, **kwargs)
-def getAFIIGeant4Tool(name="ISF_AFIIGeant4Tool", **kwargs):
+def getAFIIGeant4Tool(name="ISF_AFIIGeant4Tool", **kwargs): # TODO rename
kwargs.setdefault('UserActionSvc','G4UA::ISF_AFIIUserActionSvc')
return getPassBackGeant4Tool(name, **kwargs)
-def getLongLivedGeant4Tool(name="ISF_LongLivedGeant4Tool", **kwargs):
- kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
- return getFullGeant4Tool(name, **kwargs)
-
-def getAFII_QS_Geant4Tool(name='AFII_QS_Geant4Tool', **kwargs):
- kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
- return getAFIIGeant4Tool(name, **kwargs)
-
## -----------------------------------------------------------------------------
diff --git a/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh b/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh
index 06806a9aaf3fe9ea530a2c6de1fd76ebafc685d5..305da0bbee54df6595aee1acccb770f80b7790e5 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh
@@ -40,7 +40,7 @@ Sim_tf.py \
--conditionsTag 'default:OFLCOND-MC16-SDR-14' \
--truthStrategy 'MC15aPlusLLP' \
--simulator 'FullG4MT_QS' \
- --postExec 'EVNTtoHITS:ServiceMgr.ISF_LongLivedInputConverter.GenParticleFilters["ISF_GenParticleInteractingFilter"].AdditionalNonInteractingParticleTypes=[51,52,-53,53]' \
+ --postExec 'EVNTtoHITS:ServiceMgr.ISF_InputConverter.GenParticleFilters["ISF_GenParticleInteractingFilter"].AdditionalNonInteractingParticleTypes=[51,52,-53,53]' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
@@ -54,7 +54,7 @@ Sim_tf.py \
--conditionsTag 'default:OFLCOND-MC16-SDR-14' \
--truthStrategy 'MC15aPlusLLP' \
--simulator 'FullG4MT_QS' \
- --postExec 'EVNTtoHITS:ServiceMgr.ISF_LongLivedInputConverter.GenParticleFilters["ISF_GenParticleInteractingFilter"].AdditionalNonInteractingParticleTypes=[51,52,-53,53]' \
+ --postExec 'EVNTtoHITS:ServiceMgr.ISF_InputConverter.GenParticleFilters["ISF_GenParticleInteractingFilter"].AdditionalNonInteractingParticleTypes=[51,52,-53,53]' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \