LCDetectors/detectors/sid01
diff -u -r1.4 -r1.5
--- compact.xml 8 Nov 2006 00:41:10 -0000 1.4
+++ compact.xml 24 Nov 2006 23:37:47 -0000 1.5
@@ -8,7 +8,7 @@
author="Norman Graf"
url="http://confluence.slac.stanford.edu/display/ilc/sid01"
status="development"
- version="$Id: compact.xml,v 1.4 2006/11/08 00:41:10 jeremy Exp $">
+ version="$Id: compact.xml,v 1.5 2006/11/24 23:37:47 partridge Exp $">
<comment>The compact format for the Silicon Detector v01 060901</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.0065*cm"/>
+ <constant name="VXD_CF_support" value="0.05*cm"/>
</define>
@@ -60,35 +61,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 +97,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 +110,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 +134,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 +184,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 +205,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">
+ <layer id="1" inner_r = "1.44*cm" outer_z = "6.27*cm">
<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
</layer>
- <layer id="2" inner_r = "2.26*cm-VXD_CF_sensor" outer_z = "6.749*cm">
+ <layer id="2" inner_r = "2.24*cm" outer_z = "6.27*cm">
<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
</layer>
- <layer id="3" inner_r = "3.54*cm-VXD_CF_sensor" outer_z = "6.749*cm">
+ <layer id="3" inner_r = "3.52*cm" outer_z = "6.27*cm">
<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
</layer>
- <layer id="4" inner_r = "4.80*cm-VXD_CF_sensor" outer_z = "6.749*cm">
+ <layer id="4" inner_r = "4.78*cm" outer_z = "6.27*cm">
<slice material = "CarbonFiber" thickness ="VXD_CF_sensor"/>
</layer>
- <layer id="5" inner_r = "6.04*cm-VXD_CF_sensor" outer_z = "6.749*cm">
+ <layer id="5" inner_r = "6.02*cm" outer_z = "6.27*cm">
<slice material = "CarbonFiber" 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">
+ <layer id="1" inner_r = "1.44*cm" inner_z = "6.27*cm" outer_r = "7.16*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
</layer>
- <layer id="2" inner_r = "1.45*cm" inner_z = "6.78*cm" outer_r = "16.953*cm">
+ <layer id="2" inner_r = "1.44*cm" inner_z = "6.30*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
</layer>
- <layer id="3" inner_r = "1.6*cm" inner_z = "7.62*cm" outer_r = "16.953*cm">
+ <layer id="3" inner_r = "1.395*cm" inner_z = "7.21*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
</layer>
- <layer id="4" inner_r = "1.6*cm" inner_z = "9.52*cm" outer_r = "16.953*cm">
+ <layer id="4" inner_r = "1.595*cm" inner_z = "9.05*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
</layer>
- <layer id="5" inner_r = "2.0*cm" inner_z = "12.52*cm" outer_r = "16.953*cm">
+ <layer id="5" inner_r = "1.795*cm" inner_z = "12.19*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_sensor" />
</layer>
- <layer id="6" inner_r = "2.0*cm" inner_z = "18.02*cm" outer_r = "16.953*cm">
+ <layer id="6" inner_r = "1.995*cm" inner_z = "17.03*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" 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 +258,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 +285,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,37 +314,37 @@
<!-- Barrel Tracker Supports -->
<detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
- <layer id="1" inner_r = "18.500*cm" outer_z = "26.7*cm">
- <slice material = "CarbonFiber" thickness = "0.025*cm" />
- <slice material = "Rohacell31" thickness="0.8*cm" />
- <slice material = "CarbonFiber" thickness="0.025*cm" />
- </layer>
- <layer id="2" inner_r = "44.100*cm" outer_z = "60.8*cm">
- <slice material = "CarbonFiber" thickness = "0.025*cm" />
- <slice material = "Rohacell31" thickness="0.8*cm" />
- <slice material = "CarbonFiber" thickness="0.025*cm" />
- </layer>
- <layer id="3" inner_r = "69.600*cm" outer_z = "94.8*cm">
- <slice material = "CarbonFiber" thickness = "0.025*cm" />
- <slice material = "Rohacell31" thickness="0.8*cm" />
- <slice material = "CarbonFiber" thickness="0.025*cm" />
- </layer>
- <layer id="4" inner_r = "95.200*cm" outer_z = "128.9*cm">
- <slice material = "CarbonFiber" thickness = "0.025*cm" />
- <slice material = "Rohacell31" thickness="0.8*cm" />
- <slice material = "CarbonFiber" thickness="0.025*cm" />
- </layer>
- <layer id="5" inner_r = "120.800*cm" outer_z = "163.0*cm">
- <slice material = "CarbonFiber" thickness = "0.025*cm" />
- <slice material = "Rohacell31" thickness="0.8*cm" />
- <slice material = "CarbonFiber" thickness="0.025*cm" />
+ <layer id="1" inner_r = "20.6*cm" outer_z = "57.7*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness="0.8075*cm" />
+ <slice material = "CarbonFiber" thickness="0.05*cm" />
+ </layer>
+ <layer id="2" inner_r = "45.600*cm" outer_z = "84.3*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness="0.8075*cm" />
+ <slice material = "CarbonFiber" thickness="0.05*cm" />
+ </layer>
+ <layer id="3" inner_r = "70.600*cm" outer_z = "110.2*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness="0.8075*cm" />
+ <slice material = "CarbonFiber" thickness="0.05*cm" />
+ </layer>
+ <layer id="4" inner_r = "95.600*cm" outer_z = "136.6*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness="0.8075*cm" />
+ <slice material = "CarbonFiber" thickness="0.05*cm" />
+ </layer>
+ <layer id="5" inner_r = "120.600*cm" outer_z = "162.4*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness="0.8075*cm" />
+ <slice material = "CarbonFiber" thickness="0.05*cm" />
</layer>
</detector>
<!-- 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 = "PEEK" thickness = "0.02*cm" />
<slice material = "Rohacell31" thickness="0.14*cm" />
<slice material = "Epoxy" thickness="0.0175*cm" />
@@ -353,7 +354,7 @@
<slice material = "Kapton" thickness = "0.0038*cm" />
<slice material = "Copper" thickness = "0.00038*cm" />
</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 = "PEEK" thickness = "0.02*cm" />
<slice material = "Rohacell31" thickness="0.14*cm" />
<slice material = "Epoxy" thickness="0.0175*cm" />
@@ -363,7 +364,7 @@
<slice material = "Kapton" thickness = "0.0051*cm" />
<slice material = "Copper" thickness = "0.00052*cm" />
</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 = "PEEK" thickness = "0.02*cm" />
<slice material = "Rohacell31" thickness="0.14*cm" />
<slice material = "Epoxy" thickness="0.0175*cm" />
@@ -373,7 +374,7 @@
<slice material = "Kapton" thickness = "0.0064*cm" />
<slice material = "Copper" thickness = "0.00065*cm" />
</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 = "PEEK" thickness = "0.02*cm" />
<slice material = "Rohacell31" thickness="0.14*cm" />
<slice material = "Epoxy" thickness="0.0175*cm" />
@@ -383,7 +384,7 @@
<slice material = "Kapton" thickness = "0.0078*cm" />
<slice material = "Copper" thickness = "0.00079*cm" />
</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 = "PEEK" thickness = "0.02*cm" />
<slice material = "Rohacell31" thickness="0.14*cm" />
<slice material = "Epoxy" thickness="0.0175*cm" />
@@ -398,32 +399,32 @@
<!-- Endcap Tracker Supports -->
<detector id="0" name="TrackerEndcapSupports" type="DiskTracker" reflect="true" >
- <layer id="1" inner_r = "18.5*cm" inner_z = "61.1*cm" outer_r = "48.600*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- </layer>
- <layer id="2" inner_r = "18.5*cm" inner_z = "95.1*cm" outer_r = "74.100*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- </layer>
- <layer id="3" inner_r = "18.5*cm" inner_z = "129.2*cm" outer_r = "99.700*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- </layer>
- <layer id="4" inner_r = "19.5*cm" inner_z = "163.3*cm" outer_r = "125.300*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
+ <layer id="1" inner_r = "20.5*cm" inner_z = "84.5*cm" outer_r = "51.0*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.6275*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ </layer>
+ <layer id="2" inner_r = "20.5*cm" inner_z = "110.3*cm" outer_r = "76.300*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.6275*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ </layer>
+ <layer id="3" inner_r = "20.5*cm" inner_z = "136.7*cm" outer_r = "101.3*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.6275*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ </layer>
+ <layer id="4" inner_r = "20.5*cm" inner_z = "162.6*cm" outer_r = "126.300*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.6275*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
</detector>
<!-- 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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0051*cm" />
@@ -433,13 +434,13 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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.75*cm" outer_r = "49.4*cm" >
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0051*cm" />
<slice material = "Copper" thickness = "0.00052*cm" />
</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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0064*cm" />
@@ -449,13 +450,13 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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.65*cm" outer_r = "74.7*cm">
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0064*cm" />
<slice material = "Copper" thickness = "0.00065*cm" />
</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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0078*cm" />
@@ -465,13 +466,13 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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.05*cm" outer_r = "99.9*cm">
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0078*cm" />
<slice material = "Copper" thickness = "0.00079*cm" />
</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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0091*cm" />
@@ -481,7 +482,7 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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 = "163.85*cm" outer_r = "125.0*cm" >
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0091*cm" />
@@ -492,27 +493,27 @@
<!-- Forward Tracker Supports -->
<detector id="0" name="TrackerForwardSupports" type="DiskTracker" reflect="true">
- <layer id="1" inner_r = "2.8531*cm" inner_z = "18.9225*cm" outer_r = "16.953*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- </layer>
- <layer id="2" inner_r = "7.5831*cm" inner_z = "54.3677*cm" outer_r = "16.953*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- </layer>
- <layer id="3" inner_r = "11.7309*cm" inner_z = "81.4761*cm" outer_r = "16.953*cm">
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
- <slice material = "Rohacell31" thickness = "1.2*cm" />
- <slice material = "CarbonFiber" thickness = "0.039*cm" />
+ <layer id="1" inner_r = "2.68*cm" inner_z = "21.18*cm" outer_r = "16.87*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.35*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ </layer>
+ <layer id="2" inner_r = "7.41*cm" inner_z = "54.37*cm" outer_r = "16.87*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.35*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ </layer>
+ <layer id="3" inner_r = "11.55*cm" inner_z = "83.48*cm" outer_r = "16.87*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
+ <slice material = "Rohacell31" thickness = "0.35*cm" />
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
</detector>
<!-- 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.55*cm" outer_r = "16.67*cm">
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0038*cm" />
@@ -522,13 +523,13 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0038*cm" />
<slice material = "Copper" thickness = "0.00038*cm" />
</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 = "54.0*cm" outer_r = "16.67*cm">
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0038*cm" />
@@ -538,13 +539,13 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0038*cm" />
<slice material = "Copper" thickness = "0.00038*cm" />
</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 = "83.1*cm" outer_r = "16.67*cm">
<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0038*cm" />
@@ -554,7 +555,7 @@
<slice material = "Epoxy" thickness="0.0175*cm" />
<slice material = "CarbonFiber" thickness=".016*cm" />
</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.03*cm" sensitive = "yes" />
<slice material = "Silicon" thickness = "0.00048*cm" />
<slice material = "Kapton" thickness = "0.0038*cm" />
@@ -565,43 +566,43 @@
<!-- Tracker Support Rings -->
<detector id="0" name="TrackerSupportRings" type="DiskTracker" reflect="true">
- <layer id="1" inner_r = "18.500*cm" inner_z = "26.7*cm" outer_r = "44.100*cm">
- <slice material = "CarbonFiber" thickness = "0.15*cm" />
+ <layer id="1" inner_r = "21.5*cm" inner_z = "57.0*cm" outer_r = "45.6*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
- <layer id="2" inner_r = "44.100*cm" inner_z = "60.8*cm" outer_r = "69.600*cm">
- <slice material = "CarbonFiber" thickness = "0.15*cm" />
+ <layer id="2" inner_r = "46.5*cm" inner_z = "83.6*cm" outer_r = "70.6*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
- <layer id="3" inner_r = "69.600*cm" inner_z = "94.8*cm" outer_r = "95.200*cm">
- <slice material = "CarbonFiber" thickness = "0.15*cm" />
+ <layer id="3" inner_r = "71.5*cm" inner_z = "109.5*cm" outer_r = "95.6*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
- <layer id="4" inner_r = "95.200*cm" inner_z = "128.9*cm" outer_r = "120.800*cm">
- <slice material = "CarbonFiber" thickness = "0.15*cm" />
+ <layer id="4" inner_r = "96.5*cm" inner_z = "135.9*cm" outer_r = "120.6*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
- <layer id="5" inner_r = "120.800*cm" inner_z = "163.0*cm" outer_r = "126.5*cm">
- <slice material = "CarbonFiber" thickness = "0.15*cm" />
+ <layer id="5" inner_r = "121.5*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
+ <slice material = "CarbonFiber" thickness = "0.05*cm" />
</layer>
</detector>
<!-- Tracker Readout/Power Distribution System -->
<detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
- <layer id="1" inner_r = "23.500*cm" inner_z = "27.0*cm" outer_r = "43.600*cm">
+ <layer id="1" inner_r = "25.7*cm" inner_z = "57.1*cm" outer_r = "45.6*cm">
<slice material = "G10" thickness = "0.057*cm" />
<slice material = "Copper" thickness = "0.0038*cm" />
</layer>
- <layer id="2" inner_r = "49.100*cm" inner_z = "61.1*cm" outer_r = "69.100*cm">
+ <layer id="2" inner_r = "51.0*cm" inner_z = "83.7*cm" outer_r = "70.6*cm">
<slice material = "G10" thickness = "0.102*cm" />
<slice material = "Copper" thickness = "0.0068*cm" />
</layer>
- <layer id="3" inner_r = "74.600*cm" inner_z = "95.1*cm" outer_r = "94.700*cm">
+ <layer id="3" inner_r = "76.3*cm" inner_z = "109.6*cm" outer_r = "95.6*cm">
<slice material = "G10" thickness = "0.108*cm" />
<slice material = "Copper" thickness = "0.0072*cm" />
</layer>
- <layer id="4" inner_r = "100.200*cm" inner_z = "129.2*cm" outer_r = "120.300*cm">
+ <layer id="4" inner_r = "101.3*cm" inner_z = "136.0*cm" outer_r = "120.6*cm">
<slice material = "G10" thickness = "0.186*cm" />
<slice material = "Copper" thickness = "0.0124*cm" />
</layer>
- <layer id="5" inner_r = "100.200*cm" inner_z = "167.0*cm" outer_r = "120.300*cm">
+ <layer id="5" inner_r = "101.3*cm" inner_z = "167.0*cm" outer_r = "120.6*cm">
<slice material = "G10" thickness = "0.246*cm" />
<slice material = "Copper" thickness = "0.0164*cm" />
</layer>
@@ -811,7 +812,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>
@@ -820,7 +821,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>