Modify the flow so AtlasEnvelopeCfg runs

Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py

@@ -46,6 +46,7 @@ def G4AtlasAlgCfg(ConfigFlags, name='G4AtlasAlg', **kwargs):
     result = ComponentAccumulator()
     #add Services to G4AtlasAlg
     acc, DetGeoSvc = DetectorGeometrySvcCfg(ConfigFlags)
+    print "TESTTTTT" #check if it runs!
     kwargs.setdefault('DetGeoSvc', DetGeoSvc)
     result.merge(acc)
 
@@ -127,6 +128,8 @@ if __name__ == '__main__':
   inputDir = defaultTestFiles.d
   ConfigFlags.Input.Files = defaultTestFiles.EVNT
 
+  ConfigFlags.Sim.WorldRRange = 15000
+  ConfigFlags.Sim.WorldZRange = 27000 #change defaults?
   # Finalize 
   ConfigFlags.lock()
 

Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfigNew.py

@@ -210,10 +210,13 @@ def DetectorGeometrySvcCfg(ConfigFlags, name="DetectorGeometrySvc", **kwargs):
         kwargs.setdefault("RegionCreators", getTB_RegionCreatorList(ConfigFlags))
         kwargs.setdefault("FieldManagers", getTB_FieldMgrList(ConfigFlags))
     else:
-        if ConfigFlags.Beam.Type == 'cosmics' or ConfigFlags.Sim.CavernBG != 'Signal':
+        #if ConfigFlags.Beam.Type == 'cosmics' or ConfigFlags.Sim.CavernBG != 'Signal':
+        if False:
             kwargs.setdefault("World", 'Cavern')
         else:
-            kwargs.setdefault("World", ATLASEnvelopeCfg(ConfigFlags))
+            accGeo, toolGeo = ATLASEnvelopeCfg(ConfigFlags)
+            kwargs.setdefault("World", toolGeo)
+            result.merge(accGeo)
         kwargs.setdefault("RegionCreators", getATLAS_RegionCreatorList(ConfigFlags))
         #if hasattr(simFlags, 'MagneticField') and simFlags.MagneticField.statusOn:
         if True:
@@ -258,13 +261,17 @@ if __name__ == '__main__':
   inputDir = defaultTestFiles.d
   ConfigFlags.Input.Files = defaultTestFiles.EVNT
 
-
   ConfigFlags.Detector.SimulateBpipe = True
   ConfigFlags.Detector.SimulateID = True
   ConfigFlags.Detector.SimulateCalo = True 
   ConfigFlags.Detector.SimulateMuon = True
   ConfigFlags.Detector.SimulateForward = True
   ConfigFlags.Detector.GeometryFwdRegion = True
+
+
+  ConfigFlags.Sim.CavernBG = "Signal"  #for it to go via atlas?
+  ConfigFlags.Sim.WorldRRange = 15000
+  ConfigFlags.Sim.WorldZRange = 27000
   # Finalize 
   ConfigFlags.lock()