Change to Calo volume to avoid overlaps

Changes from @solodkov to fix overlaps in test beam geometries - as
discussed in ATLASSIM-3556.


Former-commit-id: 6e5d6fbfadccccd36cdaffad2f417177642f65d4

Simulation/G4Atlas/G4AtlasTools/python/G4CTBGeometryConfig.py

@@ -324,7 +324,7 @@ def getCTB_CALOEnvelope(name="CTB_CALO", **kwargs):
     kwargs.setdefault("NSurfaces", 3)
     kwargs.setdefault("InnerRadii", [2269.,950.,950.]) #FIXME Units?
     kwargs.setdefault("OuterRadii", [5145.,5145.,5145.]) #FIXME Units?
-    kwargs.setdefault("ZSurfaces",  [-2830.,-1050.,6310.]) #FIXME Units?
+    kwargs.setdefault("ZSurfaces",  [-3400.,-1050.,6600.]) #FIXME Units?
     SubDetectorList=[]
     kwargs.setdefault("SubDetectors", SubDetectorList)
     return CfgMgr.PolyconicalEnvelope(name, **kwargs)

Simulation/G4Atlas/G4AtlasTools/python/G4TestBeamGeometryConfig.py

@@ -70,7 +70,7 @@ def getTileTB_CALOEnvelope(name="TileTB_CALO", **kwargs):
     kwargs.setdefault("NSurfaces", 3)
     kwargs.setdefault("InnerRadii", [2269.*mm,950.*mm,950.*mm])
     kwargs.setdefault("OuterRadii", [5145.*mm,5145.*mm,5145.*mm])
-    kwargs.setdefault("ZSurfaces",  [-2830.*mm,-1050.*mm,6310.*mm])
+    kwargs.setdefault("ZSurfaces",  [-3400.*mm,-1050.*mm,6600.*mm])
     from G4AtlasApps.SimFlags import simFlags
     # Check the consistency of the flags
     if simFlags.Eta.statusOn and (simFlags.Theta.statusOn or simFlags.Z.statusOn):