Merge branch 'SimExoticsTest_ATLASSIM-4663_master' into 'master'

Fixes for SimExoticsTests jobs - ATLASSIM-4663

Closes ATLASSIM-4663

See merge request atlas/athena!35422

Simulation/G4Extensions/Charginos/python/CharginosConfig.py

@@ -3,15 +3,16 @@
 from AthenaCommon import CfgMgr
 def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
     from G4AtlasApps.SimFlags import simFlags
-    from AthenaCommon.SystemOfUnits import MeV,ns
+    from AthenaCommon.SystemOfUnits import MeV, ns, GeV # noqa: F401
+    # Example specialConfiguration: {'AMSBC1Mass': '1200.16*GeV', 'AMSBN1Mass': '1200.0*GeV', 'AMSBC1Lifetime': '0.2*ns'}
     C1Mass = eval(simFlags.specialConfiguration.get_Value().get("AMSBC1Mass", None))
     N1Mass = eval(simFlags.specialConfiguration.get_Value().get("AMSBN1Mass", None))
     C1Lifetime = eval(simFlags.specialConfiguration.get_Value().get("AMSBC1Lifetime", "-1.0"))
 
-    kwargs.setdefault("CharginoPlusMass", C1Mass*MeV) # TODO check units
+    kwargs.setdefault("CharginoPlusMass", C1Mass)
     kwargs.setdefault("CharginoPlusStable",      (C1Lifetime < 0))
     if not (C1Lifetime < 0):
-        kwargs.setdefault("CharginoPlusLifetime",    C1Lifetime*ns)
+        kwargs.setdefault("CharginoPlusLifetime",    C1Lifetime)
     ##kwargs.setdefault("CharginoPlusMass",        101.0*GeV)
     ##kwargs.setdefault("CharginoPlusWidth",       0.0*MeV)
     ##kwargs.setdefault("CharginoPlusCharge",      1.*eplus)
@@ -20,10 +21,10 @@ def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
     ##kwargs.setdefault("CharginoPlusLifetime",    -1)
     ##kwargs.setdefault("CharginoPlusShortlived",  False)
 
-    kwargs.setdefault("CharginoMinusMass", C1Mass*MeV) # TODO check units
+    kwargs.setdefault("CharginoMinusMass", C1Mass)
     kwargs.setdefault("CharginoMinusStable",      (C1Lifetime < 0))
     if not (C1Lifetime < 0):
-        kwargs.setdefault("CharginoMinusLifetime",    C1Lifetime*ns)
+        kwargs.setdefault("CharginoMinusLifetime",    C1Lifetime)
     ##kwargs.setdefault("CharginoMinusMass",        101.0*GeV)
     ##kwargs.setdefault("CharginoMinusWidth",       0.0*MeV)
     ##kwargs.setdefault("CharginoMinusCharge",      1.*eplus)
@@ -32,7 +33,7 @@ def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
     ##kwargs.setdefault("CharginoMinusLifetime",    -1)
     ##kwargs.setdefault("CharginoMinusShortlived",  False)
 
-    kwargs.setdefault("NeutralinoMass",          N1Mass*MeV) # TODO check units
+    kwargs.setdefault("NeutralinoMass",          N1Mass)
     ##kwargs.setdefault("NeutralinoWidth",         0.0*MeV)
     ##kwargs.setdefault("NeutralinoCharge",        0.*eplus)
     ##kwargs.setdefault("NeutralinoPDGCode",       1000022)

Simulation/G4Extensions/Gauginos/python/GauginosConfig.py

@@ -2,7 +2,9 @@
 
 from AthenaCommon import CfgMgr
 def getGauginosPhysicsTool(name="GauginosPhysicsTool", **kwargs):
+    from AthenaCommon.SystemOfUnits import GeV,ns # noqa: F401
     from G4AtlasApps.SimFlags import simFlags
+    # Example specialConfiguration {'GMSBSlepton': '100.0*GeV', 'GMSBGravitino': '1e-07*GeV', 'GMSBSleptonTime': '0.01*ns'}
     GMSBNeutralino = eval(simFlags.specialConfiguration.get_Value().get("GMSBNeutralino", "0*GeV"))
     GMSBTime = eval(simFlags.specialConfiguration.get_Value().get("GMSBLifeTime", "0*GeV"))
     kwargs.setdefault("NeutralinoMass",        GMSBNeutralino)

Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py

 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon import CfgMgr
+from AthenaCommon.SystemOfUnits import GeV,ns # noqa: F401
+# Example specialConfiguration {'GMSBSlepton': '100.0*GeV', 'GMSBGravitino': '1e-07*GeV', 'GMSBSleptonTime': '0.01*ns'}
 
 """
 Defining default settings for slepton/staus. Possible options are: