Resolve "Fix Solenoid radius"

Closes #58 (closed)

compact/definitions.xml

@@ -197,11 +197,13 @@
 
       Unused IDs: 115-119
     </comment>
+    <!--
     <constant name="HCalSubAssembly_ID" value="110"/>
     <constant name="HCalBarrel_ID"      value="111"/>
     <constant name="HCalEndcapP_ID"     value="112"/>
     <constant name="HCalEndcapN_ID"     value="113"/>
     <constant name="ci_HCAL_id"         value="200"/>
+    -->
     <comment> 
       =====================================
       (120-129) (near) Forward reserved
@@ -301,8 +303,8 @@
       ==========================
     </comment>
 
-    <constant name="Solenoid_length"           value="7000.0*mm"/>
-    <constant name="Solenoid_rmin"             value="3000.0*mm"/>
+    <constant name="Solenoid_length"           value="3600.0*mm"/>
+    <constant name="Solenoid_rmin"             value="1600.0*mm"/>
     <constant name="Solenoid_thickness"        value="400*mm"/>
     <constant name="Solenoid_offset"           value="600.0*mm"/>
 
@@ -416,13 +418,12 @@
     <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="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
-    <constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 10.0 *cm "/>
-    <constant name="Barrel_TotalCalThickness"   value="HcalBarrel_rmax - EcalBarrel_rmin"/>
-    <constant name="CalBarrelDivider"           value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
+    <constant name="EcalBarrel_TotalThickness"       value="30*cm"/>
+    <constant name="ECalBarrel_rmin"            value="Solinoid_rmin - 1*cm - Barrel_ECalThickness"/>
+    <!--constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 10.0 *cm "/-->
+      <!--constant name="CalBarrelDivider"           value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment> -->
 
-    <constant name="EcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * CalBarrelDivider"/>
-    <constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/>
+    <!--constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/-->
 
     <constant name="EcalBarrelLength"           value="CentralTracking_length + BackwardPIDLength"/>
     <constant name="EcalBarrel_offset"          value="(CentralTracking_length -(CentralTracking_length+BackwardPIDLength))/2.0"/>
@@ -433,17 +434,14 @@
     <constant name="BarrelLength"               value="SiliconTrackerOuterBarrelLength + ForwardPIDLength + BackwardPIDLength"/>
     <constant name="Barrel_offset"              value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0"/>
 
-    <constant name="EndcapPTotalCal_length"  value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/>
-    <constant name="EndcapNTotalCal_length"  value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/>
-
-    <constant name="EndcapP_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
-    <constant name="EndcapN_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
+    <constant name="EcalEndcapP_length"  value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/>
+    <constant name="EcalEndcapN_length"  value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/>
 
-    <constant name="EcalEndcapP_length" value="EndcapPTotalCal_length * EndcapP_CalDivide"/>
-    <constant name="EcalEndcapN_length" value="EndcapNTotalCal_length * EndcapN_CalDivide"/>
+    <!--constant name="EndcapP_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment-->
+    <!--constant name="EndcapN_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment-->
 
-    <constant name="HcalEndcapP_length" value="EndcapPTotalCal_length * (1.0 - EndcapP_CalDivide)"/>
-    <constant name="HcalEndcapN_length" value="EndcapNTotalCal_length * (1.0 - EndcapN_CalDivide)"/>
+    <!--constant name="HcalEndcapP_length" value="EndcapPTotalCal_length * (1.0 - EndcapP_CalDivide)"/-->
+    <!--constant name="HcalEndcapN_length" value="EndcapNTotalCal_length * (1.0 - EndcapN_CalDivide)"/-->
 
     <comment> These need to be set in sync with the forward and backward  detectors </comment>
     <constant name="EcalEndcapP_rmin"                      value="200.0*mm"/>
@@ -520,6 +518,7 @@
       Hadronic Calorimeter Parameters
       -------------------------------
     </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"/>
@@ -548,6 +547,7 @@
     <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
     <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
 
+      -->
     <comment>
       ----------------------
       Zero Degree Parameters
@@ -653,6 +653,7 @@
       Central Ion HCal Parameters
       --------------------------
     </comment>
+    <!--
     <constant name="ci_HCAL_rin"     value="90 * cm"/><comment> Orginally 0, changed to not overlap solenoid </comment>
     <constant name="ci_HCAL_rout"    value="300 * cm"/>
     <constant name="ci_HCAL_sizez"   value="160 * cm"/>
@@ -664,6 +665,7 @@
     <constant name="ci_HCAL_lay_rout"      value="ci_HCAL_rout - 1 * cm"/>
     <constant name="ci_HCAL_lay_thickness" value="2* cm"/>
     <constant name="ci_HCAL_lay_gapz"      value="2* cm"/>
+    -->
 
     <comment>
       --------------------------