Merge branch 'MonopoleConfigurationFixes_ATLASSIM-3440_21.0' into '21.0'

Correctly configure MonopoleLooperKiller (ATLASSIM-3440)

See merge request !4920

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)
 

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")

Simulation/SimulationJobOptions/share/specialConfig/postInclude.Monopole.py

-
-# 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()
-
-
-

Simulation/SimulationJobOptions/share/specialConfig/postInclude.Qball.py

-
-# 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()
-
-
-

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'])
 

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'])