Commit in LCDetectors/detectors/sidloi on MAIN
compact.xml+247-1601.15 -> 1.16
Rearranged the detectors, added comments.

LCDetectors/detectors/sidloi
compact.xml 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- compact.xml	22 Feb 2009 00:17:40 -0000	1.15
+++ compact.xml	24 Feb 2009 22:55:14 -0000	1.16
@@ -6,7 +6,7 @@
         author="Norman Graf, Jeremy McCormick"
         url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
         status="development"
-        version="$Id: compact.xml,v 1.15 2009/02/22 00:17:40 jeremy Exp $">
+        version="$Id: compact.xml,v 1.16 2009/02/24 22:55:14 ngraf Exp $">
         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>
@@ -87,7 +87,7 @@
             <fraction n="0.222" ref="O"/>
             <fraction n="0.116" ref="H"/>
             <fraction n="0.050" ref="B"/>
-        </material>  
+        </material>
     </materials>
     <limits>
         <limitset name="cal_limits">
@@ -122,8 +122,12 @@
         <vis name="MuonEndcapVis" r="0.28125" g="0.390625" b="0.625" showDaughters="false" visible="true"/>
         
         <vis name="BeampipeVis" r="0.7734375" g="0.8671875" b="0.99609375" showDaughters="false" visible="true"/>
+        
     </display>
     <detectors>
+        
+        <!-- Trackers  -->
+        <!-- Vertex Detector Barrel -->
         <detector id="1" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
             <module name="VtxBarrelModuleInner" vis="SiVertexBarrelModuleVis">
                 <module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
@@ -181,6 +185,8 @@
                 <z_layout dr="0.0" z0="0.0" nz="1"/>
             </layer>
         </detector>
+        
+        <!-- Vertex Detector Endcaps -->
         <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
             <module name="SiVertexEndcapModule">
                 <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
@@ -201,6 +207,8 @@
                 <module_parameters r_size="19.0" phi_size_max="10.0" />
             </layer>
         </detector> 
+        
+        <!-- Outer Tracker Barrel -->
         <detector id="3" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrelHits">
             <module name="SiTrackerModule_Layer1" vis="SiTrackerBarrelModuleVis">                
                 <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
@@ -378,6 +386,8 @@
                 <z_layout dr="4.0" z0="1476.497" nz="35"/>
             </layer>
         </detector>
+        
+        <!-- Outer Tracker Endcaps -->
         <detector id="4" name="SiTrackerEndcap" type="SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
             <module name="Module1" vis="SiTrackerEndcapModuleVis">
                 <trd x1="36.112" x2="46.635" z="100.114/2" />
@@ -448,6 +458,8 @@
                 <ring r="1206.937" zstart="1555.647+1.75" nmodules="84" dz="1.75" module="Module2"/>
             </layer>
         </detector>
+        
+        <!-- Forward Tracker inside Vertex Support Barrel -->
         <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">    
             <module name="SiTrackerForwardModule">
                 <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
@@ -465,34 +477,10 @@
                 <module_parameters r_size="18.0" phi_size_max="5" />
             </layer>        
         </detector>
-        <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits">
-            <dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
-            <beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
-            <layer repeat="50">
-                <slice material="TungstenDens24" thickness="0.271*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>
-        </detector>
-        <detector id="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits">
-            <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
-            <layer repeat="20" >
-                <slice material = "TungstenDens24" thickness = "0.271*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.543*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>
-        </detector>
+        
+       <!-- Calorimeters  -->        
+
+        <!-- EM Calorimeter Barrel -->
         <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis">
             <dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
             <staves vis="EcalBarrelStaveVis"/>
@@ -517,6 +505,8 @@
                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>
+        
+        <!-- EM Calorimeter Endcaps -->
         <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis">
             <dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="260.0" rmax="1264.5" />
             <layer repeat="1">
@@ -540,6 +530,8 @@
                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>
+        
+        <!-- Hadron Calorimeter Barrel -->
         <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis">
             <dimensions numsides="12" rmin="1419.0" z="3018.0 * 2"/>
             <staves vis="HcalBarrelStavesVis"/>
@@ -552,6 +544,8 @@
                 <slice material = "Air" thickness = "0.16*cm" />
             </layer>
         </detector>
+        
+        <!-- Hadron Calorimeter Endcaps -->
         <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis">
             <dimensions numsides="12" zmin="1805.0" rmin="200.0" rmax="1250.0" />
             <layer repeat="40">
@@ -563,6 +557,8 @@
                 <slice material = "Air" thickness = "0.16*cm" />
             </layer>
         </detector>
+        
+        <!-- Muon Calorimeter Barrel -->
         <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits" vis="MuonBarrelVis">
             <dimensions numsides="8" rmin="3442.0" z="3018.0 * 2"/>
             <staves vis="MuonBarrelStavesVis"/>
@@ -585,6 +581,8 @@
                 <slice material="Iron" thickness="20.0*cm" />
             </layer>
         </detector>
+        
+        <!-- Hadron Calorimeter Endcaps -->
         <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis">
             <dimensions numsides="8" zmin="3028.0" rmin="200.0" rmax="6082.0" />
             <layer repeat="11">
@@ -607,8 +605,44 @@
             </layer>
         </detector>
         
+        <!-- Luminosity Calorimeter -->
+        <detector id="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits">
+            <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
+            <layer repeat="20" >
+                <slice material = "TungstenDens24" thickness = "0.271*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.543*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>
+        </detector>
+        
+        <!-- Beam Calorimeter -->
+        <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits">
+            <dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
+            <beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
+            <layer repeat="50">
+                <slice material="TungstenDens24" thickness="0.271*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>
+        </detector>
+                
+        
         <!-- /\/\/\ START DEAD MATERIAL AND SUPPORTS. /\/\/\ -->
         
+        <!-- Beampipe -->
+        
+        <!-- Central Be Beampipe -->        
         <detector id="0" name="Beampipe" type="PolyconeSupport" insideTrackingVolume="true" vis="BeampipeVis">
             <material name="Beryllium"/>
             <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
@@ -620,55 +654,53 @@
             <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>
-        <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
-            <layer id="1" inner_r="206.0" outer_z="577.328" vis="InvisibleNoDaughters">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="2" inner_r="456.0" outer_z="749.781" vis="InvisibleNoDaughters">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="3" inner_r="706.0" outer_z="1013.802" vis="InvisibleNoDaughters">
-                <slice material= "CarbonFiber" thickness = "0.05*cm" />
-                <slice material= "Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material= "CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="4" inner_r="956.0" outer_z="1272.251" vis="InvisibleNoDaughters">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="5" inner_r="1206.0" outer_z="1535.676" vis="InvisibleNoDaughters">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-        </detector>       
-        <detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
-            <layer id="1" inner_r="25.7*cm" inner_z="590.402" outer_r="45.6*cm" vis="InvisibleNoDaughters">
-                <slice material="G10" thickness="0.057*cm" />
-                <slice material="Copper" thickness="0.0038*cm" />
-            </layer>
-            <layer id="2" inner_r="51.0*cm" inner_z="762.854" outer_r="70.6*cm" vis="InvisibleNoDaughters">
-                <slice material = "G10" thickness="0.102*cm" />
-                <slice material = "Copper" thickness="0.0068*cm" />
-            </layer>
-            <layer id="3" inner_r="76.3*cm" inner_z="1026.874" outer_r="95.6*cm" vis="InvisibleNoDaughters">
-                <slice material="G10" thickness="0.108*cm" />
-                <slice material="Copper" thickness="0.0072*cm" />
-            </layer>
-            <layer id="4" inner_r="101.3*cm" inner_z="1285.322" outer_r="120.6*cm" vis="InvisibleNoDaughters">
-                <slice material="G10" thickness="0.186*cm" />
-                <slice material="Copper" thickness="0.0124*cm" />
-            </layer>
-            <layer id="5" inner_r= "101.3*cm" inner_z="1610.0" outer_r="120.6*cm" vis="InvisibleNoDaughters">
-                <slice material="G10" thickness="0.246*cm" />
-                <slice material="Copper" thickness="0.0164*cm" />
-            </layer>
+       
+       <!-- Steel beampipe cones -->
+       
+       <detector id="0" name="ForwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+            <material name="Steel235"/>
+            <zplane rmin = "15.5*cm" rmax="19.5*cm" z="182.0*cm" />
+            <zplane rmin="15.5*cm" rmax="19.5*cm"  z="323.5*cm"/>
+        </detector>             
+        
+        <detector id="0" name="BackwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+            <material name="Steel235"/>
+            <zplane rmin="15.5*cm" rmax="19.5*cm"  z="-323.5*cm"/>
+            <zplane rmin = "15.5*cm" rmax="19.5*cm" z="-182.0*cm" />
         </detector>
+        
+        <!-- Incoming and outgoing beampipes in far forward region -->        
+        
+        <detector id="0" name="NorthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+            <material name="Iron" />
+            <tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
+            <position x="-2.13*cm" y="0" z="304.27*cm" />
+            <rotation x="0.0" y="0.0070" z="0.0" />
+        </detector>
+        
+        <detector id="0" name="SouthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+            <material name="Iron" />
+            <tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
+            <position x="-2.13*cm" y="0" z="-304.27*cm" />
+            <rotation x="0.0" y="-0.0070" z="0.0" />
+        </detector>
+        
+        <detector id="0" name="NorthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+            <material name="Iron" />
+            <tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
+            <position x="2.13*cm" y="0" z="304.27*cm" />
+            <rotation x="0.0" y="-0.0070" z="0.0" />
+        </detector>
+        
+        <detector id="0" name="SouthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+            <material name="Iron" />
+            <tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
+            <position x="2.13*cm" y="0" z="-304.27*cm" />
+            <rotation x="0.0" y="0.0070" z="0.0" />
+        </detector>
+        
+        <!-- BeamPipe Liner to shield bremsstrahlung photons-->
+        
         <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Titanium"/>
             <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" />
@@ -678,6 +710,9 @@
             <zplane rmin="1.1925*cm" rmax="1.2*cm" z="6.251*cm" />
             <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>   
+       
+        <!-- Vacuum inside beampipe -->
+        
         <detector id="0" name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Vacuum"/>
             <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
@@ -686,41 +721,26 @@
             <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)*bp_cone_slope+1.1925)"  z="tracking_region_zmax" />
-        </detector>     
-        <detector id="0" name="VXDcableZbackwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <material name="Copper"/>
-            <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>
-        <detector id="0" name="VXDcableZbackwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <material name="Copper"/>
-            <zplane rmin="1.455*cm"   rmax="1.467*cm"  z="-9.99*cm"/>
-            <zplane rmin="1.32*cm"    rmax="1.332*cm"  z="-6.91*cm"/>
-        </detector>
-        <detector id="0" name="VXDcableZforwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <material name="Copper"/>
-            <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>
-        <detector id="0" name="VXDcableZforwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <material name="Copper"/>
-            <zplane rmin="1.455*cm"   rmax="1.467*cm"  z="9.99*cm"/>
-            <zplane rmin="1.32*cm"    rmax="1.332*cm"  z="6.91*cm"/>
-        </detector>
-        <detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <material name="G10"/>
-            <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="-12.0*cm"/>
-            <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="-10.0*cm"/>
-        </detector>
-        <detector id="0" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <material name="G10"/>
-            <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="10.0*cm"/>
-            <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
         </detector>
+     
+        <detector id="0" name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+            <material name="Vacuum"/>
+            <zplane rmin="0.*cm" rmax="6.0*cm"    z="tracking_region_zmax" />
+            <zplane rmin="0.*cm" rmax="6.0*cm"    z="182*cm" />
+            <zplane rmin="0.*cm" rmax="12.4*cm"  z="282*cm"/>
+        </detector> 
+        
+        <detector id="0" name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+            <material name="Vacuum"/>
+            <zplane rmin="0.*cm" rmax="12.4*cm"  z="-282*cm"/>
+            <zplane rmin="0.*cm" rmax="6.0*cm"    z="-182*cm" />
+            <zplane rmin="0.*cm" rmax="6.0*cm"    z="-tracking_region_zmax" />
+        </detector> 
+        
+        
+        <!-- Vertex Detector Supports and Readout -->
+        
+        <!-- Double-walled Carbon Fiber support tube -->
         <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
             <layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm" vis="InvisibleNoDaughters">
                 <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
@@ -729,6 +749,7 @@
                 <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
             </layer>
         </detector>
+        
         <detector id="0" name="VertexEndSupports" type="DiskTracker" reflect="true">    
             <layer id="7" inner_r = "4.80*cm" inner_z = "86.88*cm" outer_r = "16.87*cm" vis="InvisibleNoDaughters">
                 <slice material = "CarbonFiber" thickness = "VXD_CF_support" />
@@ -737,6 +758,9 @@
                 <slice material = "CarbonFiber" thickness = "VXD_CF_support" />
             </layer>
         </detector>
+        
+        <!-- Readout and Cabling  -->
+       
         <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.4*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness ="0.5*cm"/>
@@ -789,7 +813,80 @@
             <layer id="17" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "16.80*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
+        </detector>        
+        
+        <detector id="0" name="VXDcableZbackwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <material name="Copper"/>
+            <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>
+        
+        <detector id="0" name="VXDcableZbackwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <material name="Copper"/>
+            <zplane rmin="1.455*cm"   rmax="1.467*cm"  z="-9.99*cm"/>
+            <zplane rmin="1.32*cm"    rmax="1.332*cm"  z="-6.91*cm"/>
+        </detector>
+        
+        <detector id="0" name="VXDcableZforwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <material name="Copper"/>
+            <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>
+        
+        <detector id="0" name="VXDcableZforwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <material name="Copper"/>
+            <zplane rmin="1.455*cm"   rmax="1.467*cm"  z="9.99*cm"/>
+            <zplane rmin="1.32*cm"    rmax="1.332*cm"  z="6.91*cm"/>
+        </detector>
+        
+        <detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <material name="G10"/>
+            <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="-12.0*cm"/>
+            <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="-10.0*cm"/>
+        </detector>
+        
+        <detector id="0" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <material name="G10"/>
+            <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="10.0*cm"/>
+            <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
+        </detector>
+        
+        <!-- Outer Tracker Supports and Readout -->
+        
+        <!-- Barrels  -->
+        <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
+            <layer id="1" inner_r="206.0" outer_z="577.328" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="2" inner_r="456.0" outer_z="749.781" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="3" inner_r="706.0" outer_z="1013.802" vis="InvisibleNoDaughters">
+                <slice material= "CarbonFiber" thickness = "0.05*cm" />
+                <slice material= "Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material= "CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="4" inner_r="956.0" outer_z="1272.251" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="5" inner_r="1206.0" outer_z="1535.676" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+        </detector>
+        
+        <!-- Dished endcap disks  -->
         <detector id="0" name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="750.417-0.001" />
@@ -957,27 +1054,48 @@
             <zplane rmin="1258.071" rmax="1263.808" z="-1543.863-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1635.890-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1636.392-0.001" />
+        </detector>        
+       
+        <!-- Readouts -->
+        
+        <detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
+            <layer id="1" inner_r="25.7*cm" inner_z="590.402" outer_r="45.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.057*cm" />
+                <slice material="Copper" thickness="0.0038*cm" />
+            </layer>
+            <layer id="2" inner_r="51.0*cm" inner_z="762.854" outer_r="70.6*cm" vis="InvisibleNoDaughters">
+                <slice material = "G10" thickness="0.102*cm" />
+                <slice material = "Copper" thickness="0.0068*cm" />
+            </layer>
+            <layer id="3" inner_r="76.3*cm" inner_z="1026.874" outer_r="95.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.108*cm" />
+                <slice material="Copper" thickness="0.0072*cm" />
+            </layer>
+            <layer id="4" inner_r="101.3*cm" inner_z="1285.322" outer_r="120.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.186*cm" />
+                <slice material="Copper" thickness="0.0124*cm" />
+            </layer>
+            <layer id="5" inner_r= "101.3*cm" inner_z="1610.0" outer_r="120.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.246*cm" />
+                <slice material="Copper" thickness="0.0164*cm" />
+            </layer>
         </detector>
+  
+       
+        <!-- Masks -->
+        
         <detector id="0" name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="TungstenDens24"/>
             <zplane rmin = "8.0*cm" rmax="15.5*cm" z="182.0*cm" />
             <zplane rmin="13.78*cm" rmax="15.5*cm"  z="313.5*cm"/>
         </detector>
-        <detector id="0" name="ForwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
-            <material name="Steel235"/>
-            <zplane rmin = "15.5*cm" rmax="19.5*cm" z="182.0*cm" />
-            <zplane rmin="15.5*cm" rmax="19.5*cm"  z="323.5*cm"/>
-        </detector>        
+    
         <detector id="0" name="BackwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="TungstenDens24"/>
             <zplane rmin="13.78*cm" rmax="15.5*cm"  z="-313.5*cm"/>
             <zplane rmin = "8.0*cm" rmax="15.5*cm" z="-182.0*cm" />
         </detector>
-        <detector id="0" name="BackwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
-            <material name="Steel235"/>
-            <zplane rmin="15.5*cm" rmax="19.5*cm"  z="-323.5*cm"/>
-            <zplane rmin = "15.5*cm" rmax="19.5*cm" z="-182.0*cm" />
-        </detector>        
+     
         <detector id="0" name="ForwardLowZ" type="ForwardDetector" reflect="true" vis="InvisibleNoDaughters">
             <dimensions outer_r="12.39*cm" inner_r="0.0*cm" inner_z="282.0*cm" />
             <beampipe crossing_angle="0.014" outgoing_r="1.2*cm" incoming_r="1.0*cm" />
@@ -985,42 +1103,10 @@
                 <slice material = "BoratedPolyethylene5" thickness = "13.0*cm" sensitive = "no" />
             </layer>
         </detector>
-        <detector id="0" name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
-            <material name="Vacuum"/>
-            <zplane rmin="0.*cm" rmax="6.0*cm"    z="tracking_region_zmax" />
-            <zplane rmin="0.*cm" rmax="6.0*cm"    z="182*cm" />
-            <zplane rmin="0.*cm" rmax="12.4*cm"  z="282*cm"/>
-        </detector> 
-        <detector id="0" name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
-            <material name="Vacuum"/>
-            <zplane rmin="0.*cm" rmax="12.4*cm"  z="-282*cm"/>
-            <zplane rmin="0.*cm" rmax="6.0*cm"    z="-182*cm" />
-            <zplane rmin="0.*cm" rmax="6.0*cm"    z="-tracking_region_zmax" />
-        </detector>   
-        <detector id="0" name="NorthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
-            <material name="Iron" />
-            <tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
-            <position x="-2.13*cm" y="0" z="304.27*cm" />
-            <rotation x="0.0" y="0.0070" z="0.0" />
-        </detector>
-        <detector id="0" name="SouthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
-            <material name="Iron" />
-            <tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
-            <position x="-2.13*cm" y="0" z="-304.27*cm" />
-            <rotation x="0.0" y="-0.0070" z="0.0" />
-        </detector>
-        <detector id="0" name="NorthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
-            <material name="Iron" />
-            <tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
-            <position x="2.13*cm" y="0" z="304.27*cm" />
-            <rotation x="0.0" y="-0.0070" z="0.0" />
-        </detector>
-        <detector id="0" name="SouthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
-            <material name="Iron" />
-            <tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
-            <position x="2.13*cm" y="0" z="-304.27*cm" />
-            <rotation x="0.0" y="0.0070" z="0.0" />
-        </detector>        
+  
+      
+        <!-- Solenoid -->
+        
         <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
             <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
                 <slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
@@ -1035,11 +1121,13 @@
                 <slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness" />
             </layer>
         </detector>
+        
         <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
             <layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius" vis="SolenoidBarrelLayerVis">
                 <slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
             </layer>
         </detector>
+        
     </detectors>
     <readouts>
         <readout name="SiTrackerEndcapHits">
@@ -1092,9 +1180,8 @@
         </readout>
     </readouts>
     <fields>
-    	<!-- TODO: Needs to be updated with current numbers. -->
     	<field type="Solenoid" name="GlobalSolenoid" inner_field="5.0"
     		outer_field="-0.6" zmax="1000"
-    		outer_radius="(250.0+ 5.0 + 17.5 + 40./2.)*cm" />
+    		outer_radius="SolenoidalFieldRadius" />
     </fields>
 </lccdd>
\ No newline at end of file
CVSspam 0.2.8