Print

Print


Commit in LCDetectors/detectors/sid01_notrackermaterial on MAIN
compact.xml+116-991.1 -> 1.2
fix em calorimeter to make it the same as sid01.

LCDetectors/detectors/sid01_notrackermaterial
compact.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- compact.xml	28 Aug 2008 15:12:09 -0000	1.1
+++ compact.xml	29 Aug 2008 15:52:57 -0000	1.2
@@ -6,9 +6,9 @@
   <info name="sid01_notrackermaterial"
 	title="Silicon Detector v01"
 	author="Norman Graf"
-	url="http://confluence.slac.stanford.edu/display/ilc/sid01NoMat"
+	url="http://confluence.slac.stanford.edu/display/ilc/sid01NoTrackingMaterial"
 	status="development"
-	version="$Id: compact.xml,v 1.1 2008/08/28 15:12:09 ngraf Exp $">
+	version="$Id: compact.xml,v 1.2 2008/08/29 15:52:57 ngraf Exp $">
     <comment>The compact format for the Silicon Detector v01 No Material in Tracker 080828</comment>
   </info>
 
@@ -24,10 +24,11 @@
     <constant name="world_z" value="world_side" />
 
     <!-- tracking region -->
+    <constant name="bp_cone_slope" value="(8.96-1.20)/(185-6.25)"/>
     <constant name="tracking_region_radius" value="126.5*cm"/>
     <constant name="tracking_region_zmax" value="167.9*cm"/>
-    <constant name="VXD_CF_sensor" value="0.0076*cm"/>
-    <constant name="VXD_CF_support" value="0.0427*cm"/>
+    <constant name="VXD_CF_sensor" value="0.026*cm"/>
+    <constant name="VXD_CF_support" value="0.05*cm"/>
  
   </define>
 
@@ -50,6 +51,22 @@
       <fraction n="0.044" ref="Ni"/>
       <fraction n="0.006" ref="Fe"/>
     </material>    
+   <material name="CarbonFiber_25percent">
+      <D type="density" value="0.375" unit="g/cm3"/>
+      <fraction n="1.0" ref="CarbonFiber"/>
+    </material>
+   <material name="CarbonFiber_15percent">
+      <D type="density" value="0.225" unit="g/cm3"/>
+      <fraction n="1.0" ref="CarbonFiber"/>
+    </material>
+   <material name="Rohacell31_50percent">
+      <D type="density" value="0.016" unit="g/cm3"/>
+      <fraction n="1.0" ref="Rohacell31"/>
+    </material>
+   <material name="Rohacell31_15percent">
+      <D type="density" value="0.0048" unit="g/cm3"/>
+      <fraction n="1.0" ref="Rohacell31"/>
+    </material>
   </materials>
 
 
@@ -60,35 +77,35 @@
 
     <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Beryllium"/>
-      <zplane rmin="((37.5-6.25)*(8.96-1.2)/(185.-6.25)+1.2)*cm"
-              rmax="((37.5-6.25)*(8.96-1.2)/(185.-6.25)+1.2875)*cm" z="-37.5*cm" />
+      <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
+              rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="-37.5*cm" />
       <zplane rmin="1.2*cm" rmax="1.2875*cm"   z="-6.251*cm"/>
       <zplane rmin="1.2*cm" rmax="1.240*cm" z="-6.25*cm"/>
       <zplane rmin="1.2*cm" rmax="1.240*cm" z="6.25*cm" />
       <zplane rmin="1.2*cm" rmax="1.2875*cm" z="6.251*cm" />
-      <zplane rmin="((37.5-6.25)*(8.96-1.2)/(185.-6.25)+1.2)*cm"
-              rmax="((37.5-6.25)*(8.96-1.2)/(185.-6.25)+1.2875)*cm" z="37.5*cm" />
+      <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
+              rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="37.5*cm" />
     </detector>
 
     <!-- Steel beampipe cones -->
 
     <detector id="0" name="SteelConeZbackward" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Iron"/>
-      <zplane rmin = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.2*cm)" 
-              rmax = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.3992*cm)" 
+      <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" 
+              rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.3992*cm)" 
               z="-tracking_region_zmax" />
-      <zplane rmin = "((37.51-6.25)*(8.96-1.2)/(185.-6.25)+1.2)*cm" 
-              rmax = "((37.51-6.25)*(8.96-1.2)/(185.-6.25)+1.2875)*cm" 
+      <zplane rmin = "((37.51-6.25)*bp_cone_slope+1.2)*cm" 
+              rmax = "((37.51-6.25)*bp_cone_slope+1.2875)*cm" 
               z="-37.51*cm" />
     </detector>
 
     <detector id="0" name="SteelConeZforward" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Iron"/>            
-      <zplane rmin = "((37.51-6.25)*(8.96-1.2)/(185.-6.25)+1.2)*cm" 
-              rmax = "((37.51-6.25)*(8.96-1.2)/(185.-6.25)+1.2875)*cm"
+      <zplane rmin = "((37.51-6.25)*bp_cone_slope+1.2)*cm" 
+              rmax = "((37.51-6.25)*bp_cone_slope+1.2875)*cm"
               z="37.51*cm" /> 
-      <zplane rmin = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.2*cm)" 
-              rmax = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.3992*cm)" 
+      <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" 
+              rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.3992*cm)" 
               z="tracking_region_zmax" />
     </detector> 
   
@@ -96,12 +113,12 @@
 
     <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Titanium"/>
-      <zplane rmin = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.2*cm)" z="-tracking_region_zmax" />
+      <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="-tracking_region_zmax" />
       <zplane rmin="1.1925*cm"    rmax="1.2*cm"  z="-6.251*cm"/>
       <zplane rmin="1.1975*cm" rmax="1.20*cm" z="-6.25*cm"  />
       <zplane rmin="1.1975*cm" rmax="1.20*cm" z="6.25*cm" />
       <zplane rmin="1.1925*cm" rmax="1.2*cm" z="6.251*cm" />
-      <zplane rmin = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.2*cm)" z="tracking_region_zmax" />
+      <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="tracking_region_zmax" />
     </detector>
     
    <!-- BeamPipe Vacuum -->
@@ -109,20 +126,20 @@
 
     <detector id="0" name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Vacuum"/>
-      <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" z="-tracking_region_zmax" />
+      <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
       <zplane rmin="0.*cm" rmax="1.1925*cm"  z="-6.251*cm"/>
       <zplane rmin="0.*cm" rmax="1.1975*cm" z="-6.25*cm"  />
       <zplane rmin="0.*cm" rmax="1.1975*cm" z="6.25*cm" />
       <zplane rmin="0.*cm" rmax="1.1925*cm" z="6.251*cm" />
-      <zplane rmin = "0.*cm" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)"  z="tracking_region_zmax" />
+      <zplane rmin = "0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)"  z="tracking_region_zmax" />
     </detector>     
 
     <!-- VXD cabling and bulkhead material -->
 
     <detector id="0" name="VXDcableZbackwardOuter" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Copper"/>
-      <zplane rmin = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.4*cm)" 
-              rmax = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.404*cm)" 
+      <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.4*cm)" 
+              rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.404*cm)" 
               z="-tracking_region_zmax" />
       <zplane rmin="1.542*cm"    rmax="1.552*cm"  z="-12.01*cm"/>
     </detector>
@@ -133,8 +150,8 @@
     </detector>
     <detector id="0" name="VXDcableZforwardOuter" type="PolyconeSupport" insideTrackingVolume="true">
       <material name="Copper"/>
-      <zplane rmin = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.4*cm)" 
-              rmax = "((tracking_region_zmax-6.25*cm)*(8.96-1.2)/(185.-6.25)+1.404*cm)" 
+      <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.4*cm)" 
+              rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.404*cm)" 
               z="tracking_region_zmax" />
       <zplane rmin="1.542*cm"    rmax="1.552*cm"  z="12.01*cm"/>
     </detector>
@@ -183,19 +200,19 @@
 
 
     <detector id="12" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VtxEndcapHits" combineHits="true">
-      <layer id="1" inner_r = "1.6*cm" inner_z = "7.6*cm" outer_r = "7.5*cm">
+      <layer id="1" inner_r = "1.4*cm" inner_z = "7.18*cm" outer_r = "7.1*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
 	<slice material = "Silicon" thickness = "0.0093*cm" />
       </layer>
-      <layer id="2" inner_r = "1.6*cm" inner_z = "9.5*cm" outer_r = "7.5*cm">
+      <layer id="2" inner_r = "1.6*cm" inner_z = "9.02*cm" outer_r = "7.1*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
 	<slice material = "Silicon" thickness = "0.0093*cm" />
       </layer>
-      <layer id="3" inner_r = "2.0*cm" inner_z = "12.5*cm" outer_r = "7.5*cm">
+      <layer id="3" inner_r = "1.8*cm" inner_z = "12.16*cm" outer_r = "7.1*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
 	<slice material = "Silicon" thickness = "0.0093*cm" />
       </layer>
-      <layer id="4" inner_r = "2.0*cm" inner_z = "18.0*cm" outer_r = "7.5*cm" >
+      <layer id="4" inner_r = "2.0*cm" inner_z = "17.0*cm" outer_r = "7.1*cm" >
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
 	<slice material = "Silicon" thickness = "0.0093*cm" />
       </layer>
@@ -204,52 +221,52 @@
     <!-- Vertex supports and Inner detector tube -->
 
     <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
-      <layer id="1" inner_r = "1.46*cm-VXD_CF_sensor" outer_z = "6.749*cm">
-	<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
+      <layer id="1" inner_r = "1.43*cm" outer_z = "6.27*cm">
+	<slice material = "CarbonFiber_25percent" thickness ="VXD_CF_sensor"/>
       </layer>
-      <layer id="2" inner_r = "2.26*cm-VXD_CF_sensor" outer_z = "6.749*cm">
-	<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
+      <layer id="2" inner_r = "2.23*cm" outer_z = "6.27*cm">
+	<slice material = "CarbonFiber_25percent" thickness ="VXD_CF_sensor"/>
       </layer>
-      <layer id="3" inner_r = "3.54*cm-VXD_CF_sensor" outer_z = "6.749*cm">
-	<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
+      <layer id="3" inner_r = "3.51*cm" outer_z = "6.27*cm">
+	<slice material = "CarbonFiber_25percent" thickness ="VXD_CF_sensor"/>
       </layer>
-      <layer id="4" inner_r = "4.80*cm-VXD_CF_sensor" outer_z = "6.749*cm">
-	<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
+      <layer id="4" inner_r = "4.77*cm" outer_z = "6.27*cm">
+	<slice material = "CarbonFiber_25percent" thickness ="VXD_CF_sensor"/>
       </layer>
-      <layer id="5" inner_r = "6.04*cm-VXD_CF_sensor" outer_z = "6.749*cm">
-	<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
+      <layer id="5" inner_r = "6.01*cm" outer_z = "6.27*cm">
+	<slice material = "CarbonFiber_25percent" thickness ="VXD_CF_sensor"/>
       </layer>
-      <layer id="6" inner_r = "16.954*cm" outer_z = "100*cm">
+      <layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm">
 	<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
       </layer>
-      <layer id="7" inner_r = "18.434*cm" outer_z = "100*cm">
+      <layer id="7" inner_r = "18.42*cm" outer_z = "89.48*cm">
 	<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
       </layer>
     </detector>
 
     <detector id="0" name="VertexEndSupports" type="DiskTracker" reflect="true">
-      <layer id="1" inner_r = "1.45*cm" inner_z = "6.75*cm" outer_r = "6.04*cm">
-	<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
+      <layer id="1" inner_r = "1.44*cm" inner_z = "6.27*cm" outer_r = "7.16*cm">
+	<slice material = "CarbonFiber_25percent" thickness = "VXD_CF_sensor" />
       </layer>
-      <layer id="2" inner_r = "1.45*cm" inner_z = "6.78*cm" outer_r = "16.953*cm">
-	<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
+      <layer id="2" inner_r = "1.44*cm" inner_z = "6.30*cm" outer_r = "16.87*cm">
+	<slice material = "CarbonFiber_25percent" thickness = "VXD_CF_sensor" />
       </layer>
-      <layer id="3" inner_r = "1.6*cm" inner_z = "7.62*cm" outer_r = "16.953*cm">
-	<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
+      <layer id="3" inner_r = "1.395*cm" inner_z = "7.21*cm" outer_r = "16.87*cm">
+	<slice material = "CarbonFiber_25percent" thickness = "VXD_CF_sensor" />
       </layer>
-      <layer id="4" inner_r = "1.6*cm" inner_z = "9.52*cm" outer_r = "16.953*cm">
-	<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
+      <layer id="4" inner_r = "1.595*cm" inner_z = "9.05*cm" outer_r = "16.87*cm">
+	<slice material = "CarbonFiber_25percent" thickness = "VXD_CF_sensor" />
       </layer>
-      <layer id="5" inner_r = "2.0*cm" inner_z = "12.52*cm" outer_r = "16.953*cm">
-	<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
+      <layer id="5" inner_r = "1.795*cm" inner_z = "12.19*cm" outer_r = "16.87*cm">
+	<slice material = "CarbonFiber_25percent" thickness = "VXD_CF_sensor" />
       </layer>
-      <layer id="6" inner_r = "2.0*cm" inner_z = "18.02*cm" outer_r = "16.953*cm">
-	<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
+      <layer id="6" inner_r = "1.995*cm" inner_z = "17.03*cm" outer_r = "16.87*cm">
+	<slice material = "CarbonFiber_25percent" thickness = "VXD_CF_sensor" />
       </layer>
-      <layer id="7" inner_r = "5.5*cm" inner_z = "97.50*cm" outer_r = "16.953*cm">
+      <layer id="7" inner_r = "4.80*cm" inner_z = "86.88*cm" outer_r = "16.87*cm">
 	<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
       </layer>
-      <layer id="8" inner_r = "5.5*cm" inner_z = "99.74*cm" outer_r = "16.953*cm">
+      <layer id="8" inner_r = "4.91*cm" inner_z = "89.43*cm" outer_r = "16.87*cm">
 	<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
       </layer>
     </detector>
@@ -257,20 +274,20 @@
     <!-- Vertex on sensor readout electronics and cables at barrel endplate -->
 
     <detector id="0" name="VertexReadout" type="DiskTracker" reflect="true">
-      <layer id="1" inner_r = "1.46*cm" outer_r = "1.66*cm"  inner_z= "6.251*cm" >
-	<slice material = "G10" thickness ="0.498*cm"/>
+      <layer id="1" inner_r = "1.46*cm" outer_r = "1.66*cm"  inner_z= "6.4*cm" >
+	<slice material = "G10" thickness ="0.5*cm"/>
       </layer>
-      <layer id="2" inner_r = "2.26*cm" outer_r = "2.46*cm"  inner_z= "6.251*cm" >
-	<slice material = "G10" thickness ="0.498*cm"/>
+      <layer id="2" inner_r = "2.26*cm" outer_r = "2.46*cm"  inner_z= "6.4*cm" >
+	<slice material = "G10" thickness ="0.5*cm"/>
       </layer>
-      <layer id="3" inner_r = "3.54*cm" outer_r = "3.74*cm"  inner_z= "6.251*cm" >
-	<slice material = "G10" thickness ="0.498*cm"/>
+      <layer id="3" inner_r = "3.54*cm" outer_r = "3.74*cm"  inner_z= "6.4*cm" >
+	<slice material = "G10" thickness ="0.5*cm"/>
       </layer>
-      <layer id="4" inner_r = "4.80*cm" outer_r = "5.00*cm"  inner_z= "6.251*cm" >
-	<slice material = "G10" thickness ="0.498*cm"/>
+      <layer id="4" inner_r = "4.80*cm" outer_r = "5.00*cm"  inner_z= "6.4*cm" >
+	<slice material = "G10" thickness ="0.5*cm"/>
       </layer>
-      <layer id="5" inner_r = "6.04*cm" outer_r = "6.24*cm"  inner_z= "6.251*cm" >
-	<slice material = "G10" thickness ="0.498*cm"/>
+      <layer id="5" inner_r = "6.04*cm" outer_r = "6.24*cm"  inner_z= "6.4*cm" >
+	<slice material = "G10" thickness ="0.5*cm"/>
       </layer>
       <layer id="6" inner_r = "1.32*cm" outer_r = "2.26*cm"  inner_z= "6.90*cm" >
 	<slice material = "Copper" thickness ="0.0057*cm"/>
@@ -284,28 +301,28 @@
       <layer id="9" inner_r = "4.801*cm" outer_r = "6.04*cm"  inner_z= "6.90*cm" >
 	<slice material = "Copper" thickness ="0.0007*cm"/>
       </layer>
-      <layer id="10" inner_r = "1.5*cm"  outer_r = "1.599*cm" inner_z = "7.5*cm">
+      <layer id="10" inner_r = "1.3*cm"  outer_r = "1.399*cm" inner_z = "6.98*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="11" inner_r = "1.5*cm"  outer_r = "1.599*cm" inner_z = "9.4*cm">
+      <layer id="11" inner_r = "1.5*cm"  outer_r = "1.599*cm" inner_z = "8.82*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="12" inner_r = "1.9*cm"  outer_r = "1.999*cm" inner_z = "12.4*cm">
+      <layer id="12" inner_r = "1.7*cm"  outer_r = "1.799*cm" inner_z = "11.96*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="13" inner_r = "1.9*cm"  outer_r = "1.999*cm" inner_z = "17.9*cm">
+      <layer id="13" inner_r = "1.9*cm"  outer_r = "1.999*cm" inner_z = "16.80*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="14" inner_r = "7.501*cm"  outer_r = "8.0*cm" inner_z = "7.4*cm">
+      <layer id="14" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "6.98*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="15" inner_r = "7.501*cm"  outer_r = "8.0*cm" inner_z = "9.3*cm">
+      <layer id="15" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "8.82*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="16" inner_r = "7.501*cm"  outer_r = "8.0*cm" inner_z = "12.3*cm">
+      <layer id="16" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "11.96*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
-      <layer id="17" inner_r = "7.501*cm"  outer_r = "8.0*cm" inner_z = "17.8*cm">
+      <layer id="17" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "16.80*cm">
 	<slice material = "G10" thickness = "0.2*cm" />
       </layer>
     </detector>
@@ -313,19 +330,19 @@
     <!-- Barrel Tracker Modules -->
 
     <detector id="13" name="TrackerBarrel" type="MultiLayerTracker"  readout="TkrBarrHits" combineHits="true">
-      <layer id="1" inner_r = "20.000*cm" outer_z = "26.7*cm">
+      <layer id="1" inner_r = "21.800*cm" outer_z = "55.8*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="2" inner_r = "45.600*cm" outer_z = "60.8*cm">
+      <layer id="2" inner_r = "46.800*cm" outer_z = "82.5*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="3" inner_r = "71.100*cm" outer_z = "94.8*cm">
+      <layer id="3" inner_r = "71.800*cm" outer_z = "108.3*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="4" inner_r = "96.700*cm" outer_z = "128.9*cm">
+      <layer id="4" inner_r = "96.800*cm" outer_z = "134.7*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="5" inner_r = "122.300*cm" outer_z = "163.0*cm">
+      <layer id="5" inner_r = "121.800*cm" outer_z = "160.6*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
     </detector>
@@ -333,28 +350,28 @@
     <!-- Endcap Tracker Modules -->
 
     <detector id="14" name="TrackerEndcap" type="DiskTracker" reflect="true" readout="TkrEndcapHits" combineHits="true">
-      <layer id="1" inner_r = "18.5*cm" inner_z = "62.8*cm" outer_r = "48.600*cm">
+      <layer id="1" inner_r = "20.7*cm" inner_z = "85.5*cm" outer_r = "49.4*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="2" inner_r = "18.5*cm" inner_z = "63.2*cm" outer_r = "48.600*cm" >
+      <layer id="2" inner_r = "20.7*cm" inner_z = "85.9*cm" outer_r = "49.4*cm" >
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="3" inner_r = "18.5*cm" inner_z = "96.8*cm" outer_r = "74.100*cm" >
+      <layer id="3" inner_r = "20.7*cm" inner_z = "111.4*cm" outer_r = "74.7*cm" >
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="4" inner_r = "18.5*cm" inner_z = "97.2*cm" outer_r = "74.100*cm">
+      <layer id="4" inner_r = "20.7*cm" inner_z = "111.8*cm" outer_r = "74.7*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="5" inner_r = "18.5*cm" inner_z = "130.9*cm" outer_r = "99.700*cm">
+      <layer id="5" inner_r = "20.7*cm" inner_z = "137.8*cm" outer_r = "99.9*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="6" inner_r = "18.5*cm" inner_z = "131.3*cm" outer_r = "99.700*cm">
+      <layer id="6" inner_r = "20.7*cm" inner_z = "138.2*cm" outer_r = "99.9*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="7" inner_r = "19.5*cm" inner_z = "165.0*cm" outer_r = "125.300*cm" >
+      <layer id="7" inner_r = "20.7*cm" inner_z = "163.6*cm" outer_r = "125.0*cm" >
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="8" inner_r = "19.5*cm" inner_z = "165.4*cm" outer_r = "125.300*cm" >
+      <layer id="8" inner_r = "20.7*cm" inner_z = "164.0*cm" outer_r = "125.0*cm" >
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
     </detector>
@@ -362,22 +379,22 @@
     <!-- Forward Tracker Modules inside the support tube -->
 
     <detector id="15" name="TrackerForward" type="DiskTracker" reflect="true" readout="TkrForwardHits">
-      <layer id="1" inner_r = "2.8531*cm" inner_z = "20.6225*cm" outer_r = "16.953*cm">
+      <layer id="1" inner_r = "2.78*cm" inner_z = "20.4*cm" outer_r = "16.67*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="2" inner_r = "2.8531*cm" inner_z = "20.8625*cm" outer_r = "16.953*cm">
+      <layer id="2" inner_r = "2.78*cm" inner_z = "20.80*cm" outer_r = "16.67*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="3" inner_r = "7.5831*cm" inner_z = "54.0677*cm" outer_r = "16.953*cm">
+      <layer id="3" inner_r = "7.51*cm" inner_z = "53.85*cm" outer_r = "16.67*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="4" inner_r = "7.5831*cm" inner_z = "54.3077*cm" outer_r = "16.953*cm">
+      <layer id="4" inner_r = "7.51*cm" inner_z = "54.25*cm" outer_r = "16.67*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="5" inner_r = "11.7309*cm" inner_z = "83.1761*cm" outer_r = "16.953*cm">
+      <layer id="5" inner_r = "11.65*cm" inner_z = "82.95*cm" outer_r = "16.67*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
-      <layer id="6" inner_r = "11.7309*cm" inner_z = "83.4161*cm" outer_r = "16.953*cm">
+      <layer id="6" inner_r = "11.65*cm" inner_z = "83.35*cm" outer_r = "16.67*cm">
 	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
     </detector> 
@@ -392,15 +409,15 @@
 	<slice material = "Kapton"  thickness = "0.030*cm" />
 	<slice material = "Air"     thickness = "0.033*cm" />
       </layer>      
-      <layer repeat="30">
-	<slice material = "TungstenDens24" thickness = "0.20*cm" />
+      <layer repeat="20">
+	<slice material = "TungstenDens24" thickness = "0.25*cm" />
 	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
 	<slice material = "Copper"  thickness = "0.005*cm" />
 	<slice material = "Kapton"  thickness = "0.030*cm" />
 	<slice material = "Air"     thickness = "0.033*cm" />
       </layer>
       <layer repeat="10">
-	<slice material = "TungstenDens24" thickness = "0.3*cm" />
+	<slice material = "TungstenDens24" thickness = "0.5*cm" />
 	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
 	<slice material = "Copper"  thickness = "0.005*cm" />
 	<slice material = "Kapton"  thickness = "0.030*cm" />
@@ -416,15 +433,15 @@
 	<slice material = "Kapton"  thickness = "0.030*cm" />
 	<slice material = "Air"     thickness = "0.033*cm" />
       </layer>       
-      <layer repeat="30">
-	<slice material = "TungstenDens24" thickness = "0.20*cm" />
+      <layer repeat="20">
+	<slice material = "TungstenDens24" thickness = "0.25*cm" />
 	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
 	<slice material = "Copper"  thickness = "0.005*cm" />
 	<slice material = "Kapton"  thickness = "0.030*cm" />
 	<slice material = "Air"     thickness = "0.033*cm" />
       </layer>
       <layer repeat="10">
-	<slice material = "TungstenDens24" thickness = "0.3*cm" />
+	<slice material = "TungstenDens24" thickness = "0.5*cm" />
 	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
 	<slice material = "Copper"  thickness = "0.005*cm" />
 	<slice material = "Kapton"  thickness = "0.030*cm" />
@@ -586,7 +603,7 @@
 
     <detector id="0" name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false">
       <material name="Vacuum"/>
-      <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" z="tracking_region_zmax" />
+      <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="tracking_region_zmax" />
       <zplane rmin="0.*cm"    rmax="13.8*cm"  z="285*cm"/>
     </detector> 
     
@@ -595,7 +612,7 @@
     <detector id="0" name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false">
       <material name="Vacuum"/>
       <zplane rmin="0.*cm" rmax="13.8*cm"  z="-285*cm"/>
-      <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" z="-tracking_region_zmax" />
+      <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
     </detector>     
 
   </detectors>
CVSspam 0.2.8