modified: compact/definitions.xml

	modified:   compact/hcal.xml

compact/definitions.xml

@@ -321,11 +321,13 @@
       ============================
     </comment>
 
+    <comment>
+      -------------------------
+      GEM Tracker Parameters
+      -------------------------
+    </comment>
     <constant name="ForwardTrackingGEMLength" value="30.0*cm"/>
 
-    <constant name="tracker_region_rmax"            value="Solenoid_rmax/2.0"/>
-    <constant name="tracker_region_zmax"            value="Solenoid_length/2.0"/>
-
     <comment>
       -------------------------
       Vertex Tracker Parameters
@@ -347,6 +349,20 @@
     <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5 - ForwardTrackingGEMLength"/>
     <constant name="SiliconTrackerOuterBarrel_zmax"  value="SiliconTrackerOuterBarrelLength/2.0"/>
 
+    <comment>
+      Central tracking boundaries
+
+      The central tracking detectors are assumed to be symmtric about the origin.
+      
+    </comment>
+    <constant name="CentralTracking_rmax"    value="SiliconTrackerOuterRadius"/>
+    <constant name="CentralTracking_length"  value="SiliconTrackerOuterBarrelLength + ForwardTrackingGEMLength"/>
+
+    <comment> These are used by ddsim </comment>
+    <constant name="tracker_region_rmax"   value="Solenoid_rmax/2.0"/>
+    <constant name="tracker_region_zmax"   value="Solenoid_length/2.0"/>
+
+
     <comment>
       -------------------------------
       Central Barrel Tracker - Global
@@ -379,9 +395,10 @@
     <constant name="EcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * CalBarrelDivider"/>
     <constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/>
 
-    <constant name="EcalBarrelLength"           value="SiliconTrackerOuterBarrelLength + ForwardPIDLength + BackwardPIDLength"/>
-    <constant name="EcalEndcapP_zmin"           value="SiliconTrackerOuterBarrelLength/2.0 + ForwardPIDLength"/>
-    <constant name="EcalEndcapN_zmin"           value="SiliconTrackerOuterBarrelLength/2.0 + BackwardPIDLength"/>
+    <constant name="BarrelLength"               value="SiliconTrackerOuterBarrelLength + ForwardPIDLength + BackwardPIDLength"/>
+    <constant name="EcalBarrelLength"           value="CentralTracking_length + BackwardPIDLength"/>
+    <constant name="EcalEndcapP_zmin"           value="CentralTracking_length/2.0 + ForwardPIDLength"/>
+    <constant name="EcalEndcapN_zmin"           value="CentralTracking_length/2.0 + BackwardPIDLength"/>
     <constant name="EcalBarrel_offset"          value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0"/>
 
     <constant name="EndcapP_TotalCalThickness"  value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - (EcalEndcapP_zmin + 10.0 * mm)"/>
@@ -400,8 +417,8 @@
     <constant name="EcalEndcapP_rmin"                      value="200.0*mm"/>
     <constant name="EcalEndcapN_rmin"                      value="300.0*mm"/>
 
-    <constant name="HcalEndcapP_rmin"                      value="250.0 * mm"/>
-    <constant name="HcalEndcapN_rmin"                      value="350.0 * mm"/>
+    <constant name="HcalEndcapP_rmin"                      value="EcalEndcapP_rmin"/>
+    <constant name="HcalEndcapN_rmin"                      value="EcalEndcapN_rmin"/>
 
     <comment>
       -------------------------
@@ -473,9 +490,9 @@
     </comment>
     <constant name="HcalBarrel_rmin"          value="EcalBarrel_rmax+10.0*mm"/>
     <constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
-    <constant name="HcalBarrelLength"         value="EcalBarrelLength + EcalEndcapP_TotalThickness + EcalEndcapN_TotalThickness + 10.0*mm "/>
-    <constant name="HcalEndcap_zmin"          value="HcalBarrelLength/2.0"/>
-    <constant name="HcalEndcapAvailThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - HcalEndcap_zmin"/>
+    <constant name="HcalBarrelLength"         value="BarrelLength + EcalEndcapP_TotalThickness + EcalEndcapN_TotalThickness + 10.0*mm "/>
+    <constant name="HcalEndcapP_zmin"          value="EcalEndcapP_zmin + EcalEndcapP_TotalThickness + 5*mm"/>
+    <constant name="HcalEndcapN_zmin"          value="EcalEndcapN_zmin + EcalEndcapN_TotalThickness + 5*mm"/>
 
     <comment> Material Thickness </comment>
     <constant name="HcalSteelThickness"       value="1.89 * cm"/>
@@ -484,17 +501,19 @@
     <constant name="HcalG10Thickness"         value="3.00 * mm"/>
     <constant name="HcalAirThickness"         value="1.60 * mm"/>
 
-    <comment> Layer Thickness </comment>
-    <constant name="HcalOneLayerThickness"
+    <comment> Single Layer Thickness (for both barrel and endcap)</comment>
+    <constant name="HcalSingleLayerThickness"
       value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
 
-    <comment> H Barrel Layers and Thickness </comment>
-    <constant name="HcalBarrelLayers" value="floor(HcalBarrelAvailThickness / HcalOneLayerThickness)"/>
-    <constant name="HcalBarrelThickness" value="HcalBarrelLayers * HcalOneLayerThickness"/>
+    <comment> Hcal Barrel Layers and computed Thickness </comment>
+    <constant name="HcalBarrelLayer_NRepeat" value="floor(HcalBarrelAvailThickness / HcalSingleLayerThickness)"/>
+    <constant name="HcalBarrelThickness" value="HcalBarrelLayer_NRepeat * HcalSingleLayerThickness"/>
 
-    <comment> H Endcap Layers and Thickness </comment>
-    <constant name="HcalEndcapLayers" value="floor(HcalEndcapAvailThickness / HcalOneLayerThickness)"/>
-    <constant name="HcalEndcapThickness" value="HcalEndcapLayers * HcalOneLayerThickness"/>
+    <comment> Hcal Endcap Layers and computed Thickness </comment>
+    <constant name="HcalEndcapPLayer_NRepeat" value="floor(HcalEndcapP_TotalThickness / HcalSingleLayerThickness)"/>
+    <constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_TotalThickness / HcalSingleLayerThickness)"/>
+    <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
+    <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
 
     <comment>
       ----------------------

compact/hcal.xml

@@ -29,7 +29,7 @@
         rmin="HcalBarrel_rmin" 
         z="HcalBarrelLength"/>
       <staves vis="HcalBarrelVis"/>
-      <layer repeat="HcalBarrelLayers">
+      <layer repeat="HcalBarrelLayer_NRepeat">
         <slice material="Steel235" thickness="HcalSteelThickness"/>
         <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
         <slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
@@ -49,10 +49,10 @@
       reflect="false">
       <dimensions 
         numsides="CaloSides" 
-        zmin="HcalEndcap_zmin" 
+        zmin="HcalEndcapP_zmin" 
         rmin="HcalEndcapP_rmin"
         rmax="HcalBarrel_rmax"/>
-      <layer repeat="HcalEndcapLayers" vis="HcalEndcapVis" >
+      <layer repeat="HcalEndcapPLayer_NRepeat" vis="HcalEndcapVis" >
         <slice material="Steel235" thickness="HcalSteelThickness"/>
         <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
         <slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
@@ -71,10 +71,10 @@
       calorimeterType="HAD_ENDCAP" reflect="true">
       <dimensions 
         numsides="CaloSides" 
-        zmin="HcalEndcap_zmin" 
+        zmin="HcalEndcapN_zmin" 
         rmin="HcalEndcapN_rmin" 
         rmax="HcalBarrel_rmax"/>
-      <layer repeat="HcalEndcapLayers" vis="HcalEndcapVis" >
+      <layer repeat="HcalEndcapNLayer_NRepeat" vis="HcalEndcapVis" >
         <slice material="Steel235" thickness="HcalSteelThickness"/>
         <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
         <slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>