Merge branch 'fasernu-04-wall' into 'FASERNU-04'

Expand the GeoModel and G4 world volumes

See merge request faser/calypso!360

DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx

@@ -281,7 +281,7 @@ StatusCode GeoModelSvc::geoInit()
 
   // Build the world node from which everything else will be suspended
   const GeoMaterial* air = theMaterialManager->getMaterial("std::Air");  
-  const GeoBox* worldBox = new GeoBox(1000*Gaudi::Units::cm,1000*Gaudi::Units::cm, 1000*Gaudi::Units::cm);
+  const GeoBox* worldBox = new GeoBox(6000*Gaudi::Units::cm,2500*Gaudi::Units::cm, 12000*Gaudi::Units::cm);
   const GeoLogVol* worldLog = new GeoLogVol("WorldLog", worldBox, air);
   GeoPhysVol *worldPhys=new GeoPhysVol(worldLog);
   

Simulation/G4Faser/G4FaserTools/python/G4GeometryToolConfig.py

@@ -180,9 +180,9 @@ def FASEREnvelopeCfg(ConfigFlags, name="Faser", **kwargs):
     kwargs.setdefault("OffsetX", 0.0 * mm)
     kwargs.setdefault("OffsetY", 0.0 * mm)
     kwargs.setdefault("OffsetZ", 0.0 * mm)
-    kwargs.setdefault("dX", 600.0 * mm) 
-    kwargs.setdefault("dY", 600.0 * mm) 
-    kwargs.setdefault("dZ", 4000.0 * mm) 
+    kwargs.setdefault("dX", 6000.0 * mm) 
+    kwargs.setdefault("dY", 2500.0 * mm) 
+    kwargs.setdefault("dZ", 12000.0 * mm) 
 
     kwargs.setdefault("DetectorName", "Faser")
     SubDetectorList = result.popToolsAndMerge(generateSubDetectorList(ConfigFlags))