Put the hcal endcaps back.

	modified:   compact/definitions.xml
	modified:   compact/hcal.xml
	modified:   reference_detector.xml

compact/definitions.xml

@@ -420,11 +420,11 @@
     <constant name="EcalEndcapPSolenoid_offset" value="800.0*mm" />
     <constant name="EcalEndcapNSolenoid_offset" value="0.0*mm" />
 
-    <constant name="ExtraHcalEndcapP_length"    value="0.0*cm"/>
-    <constant name="ExtraHcalEndcapN_length"    value="0.0*cm"/>
+    <constant name="HcalEndcapPExtra_length"    value="40.0*cm"/>
+    <constant name="HcalEndcapNExtra_length"    value="40.0*cm"/>
 
-    <constant name="SolenoidYokeEndcapP_zmin"  value="Solenoid_length/2.0 + Solenoid_offset + ExtraHcalEndcapP_length"/>
-    <constant name="SolenoidYokeEndcapN_zmin"  value="Solenoid_length/2.0 - Solenoid_offset + ExtraHcalEndcapN_length"/>
+    <constant name="SolenoidYokeEndcapP_zmin"  value="Solenoid_length/2.0 + Solenoid_offset + HcalEndcapPExtra_length"/>
+    <constant name="SolenoidYokeEndcapN_zmin"  value="Solenoid_length/2.0 - Solenoid_offset + HcalEndcapNExtra_length"/>
 
     <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
     <constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 10.0 *cm "/>
@@ -452,8 +452,8 @@
     <constant name="EndcapPTotalCal_length"  value="(SolenoidYokeEndcapP_zmin + EcalEndcapPSolenoid_offset) - (EcalEndcapP_zmin)"/>
     <constant name="EndcapNTotalCal_length"  value="(SolenoidYokeEndcapN_zmin + EcalEndcapNSolenoid_offset) - (EcalEndcapN_zmin)"/>
 
-    <constant name="EndcapP_CalDivide"          value="1.0"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
-    <constant name="EndcapN_CalDivide"          value="1.0"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
+    <constant name="EndcapP_CalDivide"          value="0.8"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
+    <constant name="EndcapN_CalDivide"          value="0.8"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
 
     <constant name="EcalEndcapP_length" value="EndcapPTotalCal_length * EndcapP_CalDivide"/>
     <constant name="EcalEndcapN_length" value="EndcapNTotalCal_length * EndcapN_CalDivide"/>
@@ -538,10 +538,10 @@
     </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 - 10*cm"/>
+    <constant name="HcalBarrelLength"         value="Solenoid_length + HcalEndcapPExtra_length + HcalEndcapNExtra_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 "/>
+    <constant name="HcalEndcapP_zmin"          value="EcalEndcapP_zmin + EcalEndcapP_length "/>
+    <constant name="HcalEndcapN_zmin"          value="EcalEndcapN_zmin + EcalEndcapN_length "/>
 
     <comment> Material Thickness </comment>
     <constant name="HcalSteelThickness"       value="1.89 * cm"/>

compact/hcal.xml

@@ -15,6 +15,7 @@
   <!-- Define detector -->
   <detectors>
 
+    <!--
     <detector 
       id="HCalBarrel_ID" 
       name="HcalBarrel"
@@ -38,6 +39,7 @@
         <slice material="Air" thickness="HcalAirThickness"/>
       </layer>
     </detector>
+    -->
 
     <detector 
       id="HCalEndcapP_ID" 

reference_detector.xml

@@ -130,9 +130,9 @@
   <include ref="compact/far_forward_detectors.xml"/>
   <include ref="eic/forward_ion_beamline.xml"/>
   
+  <include ref="compact/hcal.xml"/>
   <!--
   <include ref="compact/ci_GEM.xml"/>
-  <include ref="compact/hcal.xml"/>
   <include ref="compact/cb_CTD_Si.xml"/>
   <include ref="compact/cb_VTX_Barrel.xml"/>
   <include ref="compact/ci_HCAL.xml"/>