diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py index c2028e4780a0fd3eaa534ac5458d3da1743ac376..12ac255327405b7eb0e3ef4ee95095f6dbcf56f9 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py +++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py @@ -63,8 +63,9 @@ if doG4SimConfig: # FIXME ideally would include this file early enough, so that the unlocking is not required #simFlags.EquationOfMotion.unlock() simFlags.EquationOfMotion.set_On() - simFlags.EquationOfMotion.set_Value_and_Lock("G4mplEqMagElectricField")#"MonopoleEquationOfMotion") + simFlags.EquationOfMotion.set_Value_and_Lock("G4mplEqMagElectricField") #Monopole Equation of Motion simFlags.G4Stepper.set_Value_and_Lock('ClassicalRK4') + simFlags.TightMuonStepping.set_Value_and_Lock(False) simFlags.PhysicsOptions += ["MonopolePhysicsTool"] # add monopole-specific configuration for looper killer simFlags.OptionalUserActionList.addAction('MonopoleLooperKillerTool',['Step']) diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py index 886a8d1d5739e12b85684a6c06c0325940190cf2..7bf1fc1d2c9600b336a209370844d8c0c41a406d 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py +++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py @@ -62,11 +62,6 @@ if doG4SimConfig: from G4AtlasApps import AtlasG4Eng AtlasG4Eng.G4Eng.log.info("Unlocking simFlags.EquationOfMotion to reset the value for Monopole simulation.") from G4AtlasApps.SimFlags import simFlags - # FIXME ideally would include this file early enough, so that the unlocking is not required - simFlags.EquationOfMotion.unlock() - simFlags.EquationOfMotion.set_On() - simFlags.EquationOfMotion.set_Value_and_Lock("G4mplEqMagElectricField")#"MonopoleEquationOfMotion") - simFlags.G4Stepper.set_Value_and_Lock('ClassicalRK4') simFlags.PhysicsOptions += ["MonopolePhysicsTool"] # add monopole-specific configuration for looper killer simFlags.OptionalUserActionList.addAction('MonopoleLooperKillerTool',['Step'])