modified: compact/definitions.xml

	modified:   compact/ecal.xml

compact/definitions.xml

@@ -373,7 +373,7 @@
     <constant name="SolenoidYokeEndcapN_zmin"  value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/>
 
     <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius + BarrelPIDThickness + 5.0 * mm"/>
-    <constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 5.0 *mm "/>
+    <constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 40.0 *mm "/>
     <constant name="Barrel_TotalCalThickness"   value="HcalBarrel_rmax - EcalBarrel_rmin"/>
     <constant name="CalBarrelDivider"           value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
 
@@ -478,7 +478,7 @@
     </comment>
     <constant name="HcalBarrel_rmin"          value="EcalBarrel_rmax"/>
     <constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
-    <constant name="HcalBarrelLength"         value="Solenoid_length + ExtraHcalEndcapP_length + ExtraHcalEndcapN_length- HcalEndcapP_length- HcalEndcapN_length"/>
+    <constant name="HcalBarrelLength"         value="Solenoid_length + ExtraHcalEndcapP_length + ExtraHcalEndcapN_length- HcalEndcapP_length- HcalEndcapN_length - 10*cm"/>
                                                                      
     <constant name="HcalEndcapP_zmin"          value="SolenoidYokeEndcapP_zmin - HcalEndcapP_length "/>
     <constant name="HcalEndcapN_zmin"          value="SolenoidYokeEndcapN_zmin - HcalEndcapN_length "/>

compact/ecal.xml

@@ -83,7 +83,7 @@
       readout="EcalEndcapHits" 
       vis="EcalEndcapVis" 
       calorimeterType="EM_ENDCAP" >
-      <position x="0" y="0" z="EcalBarrel_offset"/>
+      <position x="0" y="0" z="0"/>
       <dimensions 
         numsides="CaloSides" 
         zmin="EcalEndcapP_zmin" 
@@ -126,7 +126,7 @@
       readout="EcalEndcapHits" 
       vis="EcalEndcapVis" 
       calorimeterType="EM_ENDCAP">
-      <position x="0" y="0" z="EcalBarrel_offset"/>
+      <position x="0" y="0" z="0"/>
       <dimensions 
         numsides="CaloSides" 
         zmin="EcalEndcapN_zmin"