Changed the MagfieldSvc and sorted the Simulation testing

Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py

@@ -8,6 +8,7 @@ from G4AtlasServices.G4AtlasServicesConfigNew import DetectorGeometrySvcCfg
 
 from  G4AtlasAlg.G4AtlasAlgConf import G4AtlasAlg
 
+#This is old style code - to be rewritten in a later MR
 def getAthenaStackingActionTool(name='G4UA::AthenaStackingActionTool', **kwargs):
     from G4AtlasApps.SimFlags import simFlags
     ## Killing neutrinos
@@ -30,6 +31,8 @@ def getAthenaStackingActionTool(name='G4UA::AthenaStackingActionTool', **kwargs)
     kwargs.setdefault('IsISFJob', simFlags.ISFRun())
     return CfgMgr.G4UA__AthenaStackingActionTool(name,**kwargs)
 
+
+#This is old style code - to be rewritten in a later Multi-threading
 def getAthenaTrackingActionTool(name='G4UA::AthenaTrackingActionTool', **kwargs):
     kwargs.setdefault('SecondarySavingLevel', 2)
     subDetLevel=1
@@ -69,14 +72,10 @@ def G4AtlasAlgCfg(ConfigFlags, name='G4AtlasAlg', **kwargs):
         ## default true
         kwargs.setdefault('KillAbortedEvents' ,ConfigFlags.Sim.KillAbortedEvents)
 
-    from RngComps.RandomServices import AthEngines,  Ranecu
-    if AthEngines[ConfigFlags.Random.Engine]:  
-        acc =  Ranecu(ConfigFlags.Random.Engine)
-        result.merge(acc)
-    #from RngComps.RandomServices import AthEngines, RNG
-    #if ConfigFlags.Random.Engine in AthEngines.keys():
-    #    result.merge(RNG(AthEngines[ConfigFlags.Random.Engine], name="AthRNGSvc"))
-    #    kwargs.setdefault("AtRndmGenSvc",result.getService("AthRNGSvc"))
+    from RngComps.RandomServices import AthEngines, RNG
+    if ConfigFlags.Random.Engine in AthEngines.keys():
+        result.merge(RNG(ConfigFlags.Random.Engine, name="AthRNGSvc"))
+        kwargs.setdefault("AtRndmGenSvc",result.getService("AthRNGSvc"))
 
     kwargs.setdefault("RandomGenerator", "athena")
 

Simulation/G4Atlas/G4AtlasServices/test/G4AtlasFieldServices_test.py

@@ -41,10 +41,10 @@ if __name__ == '__main__':
   import os
   if not "AthSimulation_DIR" in os.environ:
     acc3 = Q1FwdG4FieldSvcCfg(ConfigFlags)
+    cfg.merge(acc3)
 
   cfg.merge(acc1)
   cfg.merge(acc2)
-  cfg.merge(acc3)
 
   # Dump config
   #cfg.getService("StoreGateSvc").Dump = True

Simulation/G4Atlas/G4AtlasServices/test/G4AtlasServicesConfig_test.py

@@ -27,8 +27,8 @@ if __name__ == '__main__':
   ConfigFlags.Detector.SimulateID = True
   ConfigFlags.Detector.SimulateCalo = True 
   ConfigFlags.Detector.SimulateMuon = True
-  ConfigFlags.Detector.SimulateForward = True
-  ConfigFlags.Detector.GeometryFwdRegion = True
+  ConfigFlags.Detector.SimulateForward = False
+  ConfigFlags.Detector.GeometryFwdRegion = False
 
 
   ConfigFlags.Sim.CavernBG = "Signal"  #for it to go via atlas?

Simulation/G4Atlas/G4AtlasTools/test/G4FieldConfig_test.py

@@ -34,10 +34,16 @@ if __name__ == '__main__':
   #add the algorithm
   acc1 = ATLASFieldManagerToolCfg(ConfigFlags)
   acc2 = TightMuonsATLASFieldManagerToolCfg(ConfigFlags)
-  acc3 = Q1FwdFieldManagerToolCfg(ConfigFlags)
+
   cfg.popToolsAndMerge(acc1)
   cfg.popToolsAndMerge(acc2)
-  cfg.popToolsAndMerge(acc3)
+
+  #don't run for simulation only tests (todo - make new general test)
+  import os
+  if not "AthSimulation_DIR" in os.environ:
+    acc3 = Q1FwdFieldManagerToolCfg(ConfigFlags)
+    cfg.popToolsAndMerge(acc3)
+
 
   # Dump config
   #cfg.getService("StoreGateSvc").Dump = True