Fixes for Monopole and Qball simulation

Running with TightMuonStepping switched on is not compatible with
Monopole simulation. No need to use specialized equation of motion
and stepper for Qball simulation. Part of fixes for ATLASSIM-3251.


Former-commit-id: 54ce689c

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

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