diff --git a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py index 86dcf26901ee6f4849b36780e4945348204625de..8874523fafde2a08bee4e77bb143583e60467add 100644 --- a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py +++ b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py @@ -61,6 +61,13 @@ def getLooperKillerEventOverlayTool(name="G4UA::LooperKillerEventOverlayTool", * return getLooperKillerTool(name, **kwargs) +def getMonopoleLooperKillerTool(name="G4UA::MonopoleLooperKillerTool", **kwargs): + kwargs.setdefault("MaxSteps",2000000) + kwargs.setdefault("PrintSteps",2) + kwargs.setdefault("VerboseLevel",0) + return getLooperKillerTool(name, **kwargs) + + def addLooperKillerTool(name="G4UA::LooperKillerTool", system=False): G4AtlasServicesConfig.addAction(name,['Step'],system) diff --git a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py index 7bdd5b9b0bc33daafa0734cb2a755156fcc4526c..06018f88b78c7d156f9d4b8eda1f301b8126a80e 100644 --- a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py +++ b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py @@ -16,6 +16,7 @@ addTool("G4UserActions.G4UserActionsConfig.getHitWrapperTool", "G4UA::HitWrapper addTool("G4UserActions.G4UserActionsConfig.getHIPKillerTool", "G4UA::HIPKillerTool") addTool("G4UserActions.G4UserActionsConfig.getHIPLArVolumeAcceptTool", "G4UA::HIPLArVolumeAcceptTool") addTool("G4UserActions.G4UserActionsConfig.getLooperKillerTool", "G4UA::LooperKillerTool") +addTool("G4UserActions.G4UserActionsConfig.getMonopoleLooperKillerTool", "G4UA::MonopoleLooperKillerTool") addTool("G4UserActions.G4UserActionsConfig.getLooperKillerEventOverlayTool", "G4UA::LooperKillerEventOverlayTool") addTool("G4UserActions.G4UserActionsConfig.getMomentumConservationTool", "G4UA::MomentumConservationTool") addTool("G4UserActions.G4UserActionsConfig.getScoringVolumeTrackKillerTool", "G4UA::ScoringVolumeTrackKillerTool") diff --git a/Simulation/SimulationJobOptions/share/specialConfig/postInclude.Monopole.py b/Simulation/SimulationJobOptions/share/specialConfig/postInclude.Monopole.py deleted file mode 100644 index 124188dd185745ba0f9ffd793e03a24e990802d8..0000000000000000000000000000000000000000 --- a/Simulation/SimulationJobOptions/share/specialConfig/postInclude.Monopole.py +++ /dev/null @@ -1,13 +0,0 @@ - -# configure the looper killer -# this configures the MT-friendly version of the looperKiller - -import G4UserActions.G4UserActionsConfig - -lkTool=CfgGetter.getPublicToolClone('MonopoleLooperKillerTool','G4UA::LooperKillerTool', PrintSteps=2, MaxSteps=2000000, VerboseLevel=0) -G4UserActionsConfig.addLooperKillerTool(lkTool) -# add default HIP killer -G4UserActionsConfig.addHIPKillerTool() - - - diff --git a/Simulation/SimulationJobOptions/share/specialConfig/postInclude.Qball.py b/Simulation/SimulationJobOptions/share/specialConfig/postInclude.Qball.py deleted file mode 100644 index 2bafd31eb0d2741825d2524fcdb801aaa64e377e..0000000000000000000000000000000000000000 --- a/Simulation/SimulationJobOptions/share/specialConfig/postInclude.Qball.py +++ /dev/null @@ -1,13 +0,0 @@ - -# configure the looper killer -# this configures the MT-friendly version of the looperKiller - -import G4UserActions.G4UserActionsConfig - -lkTool=CfgGetter.getPublicToolClone('QballLooperKillerTool','G4UA::LooperKillerTool', PrintSteps=2, MaxSteps=2000000, VerboseLevel=0) -G4UserActionsConfig.addLooperKillerTool(lkTool) -# add default HIP killer -G4UserActionsConfig.addHIPKillerTool() - - - diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py index 1836ac31137974a4d9ea6f7f5386153a2333be3d..32b3a60bb282d1edd8bfd558e6b3c93b25ae86ff 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py +++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py @@ -68,7 +68,7 @@ if doG4SimConfig: simFlags.TightMuonStepping.set_Value_and_Lock(False) simFlags.PhysicsOptions += ["MonopolePhysicsTool"] # add monopole-specific configuration for looper killer - simFlags.OptionalUserActionList.addAction('MonopoleLooperKillerTool',['Step']) + simFlags.OptionalUserActionList.addAction('G4UA::MonopoleLooperKillerTool',['Step']) # add default HIP killer simFlags.OptionalUserActionList.addAction('G4UA::HIPKillerTool',['Step']) diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py index 8157057a4aa86c1d22f888e88a7b350ca10ac0ee..56cafa160141f389cf69d05cb0cadd9239cf493a 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py +++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py @@ -69,7 +69,7 @@ if doG4SimConfig: #simFlags.G4Stepper.set_Value_and_Lock('ClassicalRK4') simFlags.PhysicsOptions += ["MonopolePhysicsTool"] # add monopole-specific configuration for looper killer - simFlags.OptionalUserActionList.addAction('MonopoleLooperKillerTool',['Step']) + simFlags.OptionalUserActionList.addAction('G4UA::MonopoleLooperKillerTool',['Step']) # add default HIP killer simFlags.OptionalUserActionList.addAction('G4UA::HIPKillerTool',['Step'])