Print

Print


Commit in LCDetectors/detectors/sid00 on MAIN
compact.xml+544-5451.1 -> 1.2
Emacs formatting.  Put system id to first 8 bits.  Changed layers to 8 bits throughout from 7 for cals and 10 for trks.

LCDetectors/detectors/sid00
compact.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- compact.xml	22 Sep 2005 19:10:23 -0000	1.1
+++ compact.xml	22 Sep 2005 20:18:32 -0000	1.2
@@ -5,7 +5,7 @@
 
   <!-- info tag containing author, version, time, unique id (url) -->
   <info name="sid00"
-        title="Silicon Detector v00"
+	title="Silicon Detector v00"
 	author="Norman Graf"
 	url="http://confluence.slac.stanford.edu/display/ilc/sid00">
     <comment>The compact format for the Silicon Detector v00 draft 1 050922</comment>
@@ -35,610 +35,609 @@
   <detectors>
 
 
-        <!-- Beampipe -->
-        
-        <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
-            <material name="Beryllium"/>
-            <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" z="-tracking_region_zmax" />
-            <zplane rmin="1.2*cm" rmax="1.3*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.3*cm" z="6.251*cm" />
-            <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" z="tracking_region_zmax" />
-        </detector>        
-        <!-- BeamPipe Liner -->
-        
-        <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
-            <material name="Titanium"/>
-            <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" 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)*(8.96-1.2)/(185.-6.25)+1.1925)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" z="tracking_region_zmax" />
-        </detector>
-        
-        <!-- VXD cabling/cooling material -->
-        
-        <detector id="0" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true">
-            <material name="G10"/>
-            <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
-            <zplane rmin="1.3*cm"    rmax="1.399*cm"  z="-6.251*cm"/>
-        </detector>
-
-        <detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true">
-            <material name="G10"/>
-            <zplane rmin="1.3*cm"    rmax="1.399*cm"  z="6.251*cm"/>
-            <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
-        </detector>
-        
-        <!-- Vertex Detector -->
-        
-        <detector id="1" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits">
-            <layer id="1" inner_r = "1.4*cm" outer_z = "6.25*cm">
-                <slice material = "Silicon" thickness = "0.008*cm"/>
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-            </layer>
-            <layer id="2" inner_r = "2.5*cm" outer_z = "6.25*cm">
-                <slice material = "Silicon" thickness = "0.008*cm"/>
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-            </layer>
-            <layer id="3" inner_r = "3.6*cm" outer_z = "6.25*cm">
-                <slice material = "Silicon" thickness = "0.008*cm"/>
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-            </layer>
-            <layer id="4" inner_r = "4.8*cm" outer_z = "6.25*cm" >
-                <slice material = "Silicon" thickness = "0.008*cm"/>
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-            </layer>
-            <layer id="5" inner_r = "6.0*cm" outer_z = "6.25*cm">
-                <slice material = "Silicon" thickness = "0.008*cm"/>
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-            </layer>
-        </detector>
-
-
-        <detector id="2" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VtxEndcapHits">
-            <layer id="1" inner_r = "1.6*cm" inner_z = "7.6*cm" outer_r = "7.5*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.020*cm" />
-            </layer>
-            <layer id="2" inner_r = "1.6*cm" inner_z = "9.5*cm" outer_r = "7.5*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.020*cm" />
-            </layer>
-            <layer id="3" inner_r = "2.0*cm" inner_z = "12.5*cm" outer_r = "7.5*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.020*cm" />
-            </layer>
-            <layer id="4" inner_r = "2.0*cm" inner_z = "18.0*cm" outer_r = "7.5*cm" >
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.020*cm" />
-            </layer>
-        </detector>
-        
-        <!-- Vertex supports and cryostat -->
-        
-        <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
-            <layer id="1" inner_r = "7.0*cm" outer_z = "6.5*cm">
-                <slice material = "Beryllium" thickness = "0.1*cm"/>
-            </layer>
-            <layer id="2" inner_r = "11.2*cm" outer_z = "24.0*cm">
-                <slice material = "PolystyreneFoam" thickness = "1.5*cm"/>
-            </layer>
-            <layer id="3" inner_r = "11.18*cm" outer_z = "21.0*cm">
-                <slice material = "Aluminum" thickness = "0.02*cm"/>
-            </layer>
-        </detector>
-        <detector id="0" name="VertexEndSupports" type="DiskTracker" reflect="true">
-                <layer id="1" inner_r = "1.5*cm" inner_z = "6.5*cm" outer_r = "7.3*cm">
-                <slice material = "G10" thickness = "0.58*cm" />
-                </layer>
-                <layer id="2" inner_r = "2.34*cm" inner_z = "21.0*cm" outer_r = "11.2*cm">
-                <slice material = "PolystyreneFoam" thickness = "3.0*cm" />
-                </layer>
-                <layer id="3" inner_r = "2.34*cm" inner_z = "20.98*cm" outer_r = "11.2*cm">
-                    <slice material = "Aluminum" thickness = "0.02*cm" />
-                </layer>
-                <layer id="4" inner_r = "1.6*cm" inner_z = "7.622*cm" outer_r = "2.3*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="5" inner_r = "1.6*cm" inner_z = "9.522*cm" outer_r = "2.3*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="6" inner_r = "2.0*cm" inner_z = "12.522*cm" outer_r = "2.7*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="7" inner_r = "2.0*cm" inner_z = "18.022*cm" outer_r = "2.7*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="8" inner_r = "6.8*cm" inner_z = "7.622*cm" outer_r = "7.5*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="9" inner_r = "6.8*cm" inner_z = "9.522*cm" outer_r = "7.5*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="10" inner_r = "6.8*cm" inner_z = "12.522*cm" outer_r = "7.5*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-                <layer id="11" inner_r = "6.8*cm" inner_z = "18.022*cm" outer_r = "7.5*cm">
-                    <slice material = "Beryllium" thickness = "0.1*cm" />
-                </layer>
-            </detector>
-
-     
-<!-- Barrel Tracker Supports -->
-   
-     <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
-          <layer id="1" inner_r = "18.000*cm" outer_z = "26.7*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness="0.025*cm" />
-          </layer>
-          <layer id="2" inner_r = "44.300*cm" outer_z = "61.7*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness="0.025*cm" />
-          </layer>
-          <layer id="3" inner_r = "70.500*cm" outer_z = "96.7*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness="0.025*cm" />
-          </layer>
-          <layer id="4" inner_r = "96.800*cm" outer_z = "131.7*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness="0.025*cm" />
-          </layer>
-          <layer id="5" inner_r = "119.300*cm" outer_z = "161.7*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness="0.025*cm" />
-          </layer>          
-     </detector>
-     
-<!-- Barrel Tracker Modules -->
-
-     <detector id="3" name="TrackerBarrel" type="MultiLayerTracker"  readout="TkrBarrHits">
-          <layer id="1" inner_r = "20.000*cm" outer_z = "26.7*cm">
-                <slice material = "PEEK" thickness = "0.02*cm" />
-                <slice material = "Rohacell31" thickness="0.14*cm" />
-		<slice material = "Epoxy" thickness="0.0175*cm" />
-                <slice material = "CarbonFiber" thickness=".016*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="2" inner_r = "46.300*cm" outer_z = "61.7*cm">
-                <slice material = "PEEK" thickness = "0.02*cm" />
-                <slice material = "Rohacell31" thickness="0.14*cm" />
-		<slice material = "Epoxy" thickness="0.0175*cm" />
-                <slice material = "CarbonFiber" thickness=".016*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 = "72.500*cm" outer_z = "96.7*cm">
-                <slice material = "PEEK" thickness = "0.02*cm" />
-                <slice material = "Rohacell31" thickness="0.14*cm" />
-		<slice material = "Epoxy" thickness="0.0175*cm" />
-                <slice material = "CarbonFiber" thickness=".016*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="4" inner_r = "98.800*cm" outer_z = "131.7*cm">
-                <slice material = "PEEK" thickness = "0.02*cm" />
-                <slice material = "Rohacell31" thickness="0.14*cm" />
-		<slice material = "Epoxy" thickness="0.0175*cm" />
-                <slice material = "CarbonFiber" thickness=".016*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="5" inner_r = "121.300*cm" outer_z = "161.7*cm">
-                <slice material = "PEEK" thickness = "0.02*cm" />
-                <slice material = "Rohacell31" thickness="0.14*cm" />
-		<slice material = "Epoxy" thickness="0.0175*cm" />
-                <slice material = "CarbonFiber" thickness=".016*cm" />
-                <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-		<slice material = "Silicon" thickness = "0.00048*cm" />
- 		<slice material = "Kapton" thickness = "0.0091*cm" />
-		<slice material = "Copper" thickness = "0.00093*cm" />
-         </layer>          
-     </detector>
-     
-<!-- Endcap Tracker Supports -->
-
-     <detector id="0" name="TrackerEndcapSupports" type="DiskTracker" reflect="true">
-        <layer id="1" inner_r = "4.0*cm" inner_z = "27.0*cm" outer_r = "25.000*cm">
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-           <slice material = "Rohacell31" thickness = "2.5*cm" />
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-        </layer>
-        <layer id="2" inner_r = "7.9*cm" inner_z = "62.0*cm" outer_r = "51.300*cm">
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-           <slice material = "Rohacell31" thickness = "2.5*cm" />
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-        </layer>
-        <layer id="3" inner_r = "11.8*cm" inner_z = "97.0*cm" outer_r = "77.500*cm">
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-           <slice material = "Rohacell31" thickness = "2.5*cm" />
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-        </layer>  
-        <layer id="4" inner_r = "15.6*cm" inner_z = "132.0*cm" outer_r = "103.800*cm">
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-           <slice material = "Rohacell31" thickness = "2.5*cm" />
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-        </layer>
-        <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "126.300*cm">
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-            <slice material = "Rohacell31" thickness = "2.5*cm" />
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-        </layer>
-    </detector>
-    
-<!-- Endcap Tracker Modules -->
-
-     <detector id="4" name="TrackerEndcap" type="DiskTracker" reflect="true" readout="TkrEndcapHits">
-        <layer id="1" inner_r = "4.0*cm" inner_z = "30.0*cm" outer_r = "25.000*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" />
-           <slice material = "PEEK" thickness = "0.02*cm" />
-           <slice material = "Rohacell31" thickness="0.14*cm" />
-	   <slice material = "Epoxy" thickness="0.0175*cm" />
-           <slice material = "CarbonFiber" thickness=".016*cm" />
-        </layer>
-        <layer id="2" inner_r = "4.0*cm" inner_z = "30.4*cm" outer_r = "25.000*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.9*cm" inner_z = "65.0*cm" outer_r = "51.300*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" />
-           <slice material = "PEEK" thickness = "0.02*cm" />
-           <slice material = "Rohacell31" thickness="0.14*cm" />
-	   <slice material = "Epoxy" thickness="0.0175*cm" />
-           <slice material = "CarbonFiber" thickness=".016*cm" />
-        </layer>           
-        <layer id="4" inner_r = "7.9*cm" inner_z = "65.4*cm" outer_r = "51.300*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="5" inner_r = "11.8*cm" inner_z = "100.0*cm" outer_r = "77.500*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" />
-           <slice material = "PEEK" thickness = "0.02*cm" />
-           <slice material = "Rohacell31" thickness="0.14*cm" />
-	   <slice material = "Epoxy" thickness="0.0175*cm" />
-           <slice material = "CarbonFiber" thickness=".016*cm" />
-        </layer>  
-        <layer id="6" inner_r = "11.8*cm" inner_z = "100.4*cm" outer_r = "77.500*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="7" inner_r = "15.6*cm" inner_z = "135.0*cm" outer_r = "103.800*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" />
-           <slice material = "PEEK" thickness = "0.02*cm" />
-           <slice material = "Rohacell31" thickness="0.14*cm" />
-	   <slice material = "Epoxy" thickness="0.0175*cm" />
-           <slice material = "CarbonFiber" thickness=".016*cm" />
-        </layer>   
-        <layer id="8" inner_r = "15.6*cm" inner_z = "135.4*cm" outer_r = "103.800*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="9" inner_r = "18.9*cm" inner_z = "165.0*cm" outer_r = "126.300*cm" >
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-	   <slice material = "Silicon" thickness = "0.00048*cm" />
-	   <slice material = "Kapton" thickness = "0.0091*cm" />
-	   <slice material = "Copper" thickness = "0.00093*cm" />
-           <slice material = "PEEK" thickness = "0.02*cm" />
-           <slice material = "Rohacell31" thickness="0.14*cm" />
-	   <slice material = "Epoxy" thickness="0.0175*cm" />
-           <slice material = "CarbonFiber" thickness=".016*cm" />
-        </layer> 
-        <layer id="10" inner_r = "18.9*cm" inner_z = "165.4*cm" outer_r = "126.300*cm" >
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-	   <slice material = "Silicon" thickness = "0.00048*cm" />
-	   <slice material = "Kapton" thickness = "0.0091*cm" />
-	   <slice material = "Copper" thickness = "0.00093*cm" />
-        </layer>        
-     </detector>
-
-<!-- Tracker Support Rings -->
-
-     <detector id="0" name="TrackerSupportRings" type="DiskTracker" reflect="true">
-        <layer id="1" inner_r = "18.000*cm" inner_z = "26.7*cm" outer_r = "44.300*cm">
-           <slice material = "CarbonFiber" thickness = "0.15*cm" />
-        </layer>
-        <layer id="2" inner_r = "44.300*cm" inner_z = "61.7*cm" outer_r = "70.500*cm">
-           <slice material = "CarbonFiber" thickness = "0.15*cm" />
-        </layer>
-        <layer id="3" inner_r = "70.500*cm" inner_z = "96.7*cm" outer_r = "96.800*cm">
-           <slice material = "CarbonFiber" thickness = "0.15*cm" />
-        </layer>  
-        <layer id="4" inner_r = "96.800*cm" inner_z = "131.7*cm" outer_r = "119.300*cm">
-           <slice material = "CarbonFiber" thickness = "0.15*cm" />
-        </layer>
-        <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
-           <slice material = "CarbonFiber" thickness = "0.15*cm" />
-        </layer>
-    </detector>
-
-<!-- Tracker Readout/Power Distribution System -->
-
-     <detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
-        <layer id="1" inner_r = "25.500*cm" inner_z = "27.0*cm" outer_r = "44.300*cm">
-           <slice material = "G10" thickness = "0.057*cm" />
-           <slice material = "Copper" thickness = "0.0038*cm" />
-        </layer>
-        <layer id="2" inner_r = "51.800*cm" inner_z = "62.0*cm" outer_r = "70.500*cm">
-           <slice material = "G10" thickness = "0.102*cm" />
-           <slice material = "Copper" thickness = "0.0068*cm" />
-        </layer>
-        <layer id="3" inner_r = "78.000*cm" inner_z = "97.0*cm" outer_r = "96.800*cm">
-           <slice material = "G10" thickness = "0.108*cm" />
-           <slice material = "Copper" thickness = "0.0072*cm" />
-        </layer>
-        <layer id="4" inner_r = "104.300*cm" inner_z = "132.0*cm" outer_r = "119.300*cm">
-           <slice material = "G10" thickness = "0.186*cm" />
-           <slice material = "Copper" thickness = "0.0124*cm" />
-        </layer>
-        <layer id="5" inner_r = "104.300*cm" inner_z = "167.0*cm" outer_r = "119.300*cm">
-           <slice material = "G10" thickness = "0.246*cm" />
-           <slice material = "Copper" thickness = "0.0164*cm" />
-        </layer>
-     </detector>
+    <!-- Beampipe -->
 
-<!-- Electromagnetic calorimeter -->
+    <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
+      <material name="Beryllium"/>
+      <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" z="-tracking_region_zmax" />
+      <zplane rmin="1.2*cm" rmax="1.3*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.3*cm" z="6.251*cm" />
+      <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" z="tracking_region_zmax" />
+    </detector>
+    <!-- BeamPipe Liner -->
+
+    <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
+      <material name="Titanium"/>
+      <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" 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)*(8.96-1.2)/(185.-6.25)+1.1925)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" z="tracking_region_zmax" />
+    </detector>
+
+    <!-- VXD cabling/cooling material -->
+
+    <detector id="0" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true">
+      <material name="G10"/>
+      <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
+      <zplane rmin="1.3*cm"    rmax="1.399*cm"  z="-6.251*cm"/>
+    </detector>
+
+    <detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true">
+      <material name="G10"/>
+      <zplane rmin="1.3*cm"    rmax="1.399*cm"  z="6.251*cm"/>
+      <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
+    </detector>
+
+    <!-- Vertex Detector -->
+
+    <detector id="1" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits">
+      <layer id="1" inner_r = "1.4*cm" outer_z = "6.25*cm">
+	<slice material = "Silicon" thickness = "0.008*cm"/>
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
+      </layer>
+      <layer id="2" inner_r = "2.5*cm" outer_z = "6.25*cm">
+	<slice material = "Silicon" thickness = "0.008*cm"/>
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
+      </layer>
+      <layer id="3" inner_r = "3.6*cm" outer_z = "6.25*cm">
+	<slice material = "Silicon" thickness = "0.008*cm"/>
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
+      </layer>
+      <layer id="4" inner_r = "4.8*cm" outer_z = "6.25*cm" >
+	<slice material = "Silicon" thickness = "0.008*cm"/>
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
+      </layer>
+      <layer id="5" inner_r = "6.0*cm" outer_z = "6.25*cm">
+	<slice material = "Silicon" thickness = "0.008*cm"/>
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
+      </layer>
+    </detector>
+
+
+    <detector id="2" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VtxEndcapHits">
+      <layer id="1" inner_r = "1.6*cm" inner_z = "7.6*cm" outer_r = "7.5*cm">
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.020*cm" />
+      </layer>
+      <layer id="2" inner_r = "1.6*cm" inner_z = "9.5*cm" outer_r = "7.5*cm">
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.020*cm" />
+      </layer>
+      <layer id="3" inner_r = "2.0*cm" inner_z = "12.5*cm" outer_r = "7.5*cm">
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.020*cm" />
+      </layer>
+      <layer id="4" inner_r = "2.0*cm" inner_z = "18.0*cm" outer_r = "7.5*cm" >
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.020*cm" />
+      </layer>
+    </detector>
+
+    <!-- Vertex supports and cryostat -->
+
+    <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
+      <layer id="1" inner_r = "7.0*cm" outer_z = "6.5*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm"/>
+      </layer>
+      <layer id="2" inner_r = "11.2*cm" outer_z = "24.0*cm">
+	<slice material = "PolystyreneFoam" thickness = "1.5*cm"/>
+      </layer>
+      <layer id="3" inner_r = "11.18*cm" outer_z = "21.0*cm">
+	<slice material = "Aluminum" thickness = "0.02*cm"/>
+      </layer>
+    </detector>
+    <detector id="0" name="VertexEndSupports" type="DiskTracker" reflect="true">
+      <layer id="1" inner_r = "1.5*cm" inner_z = "6.5*cm" outer_r = "7.3*cm">
+	<slice material = "G10" thickness = "0.58*cm" />
+      </layer>
+      <layer id="2" inner_r = "2.34*cm" inner_z = "21.0*cm" outer_r = "11.2*cm">
+	<slice material = "PolystyreneFoam" thickness = "3.0*cm" />
+      </layer>
+      <layer id="3" inner_r = "2.34*cm" inner_z = "20.98*cm" outer_r = "11.2*cm">
+	<slice material = "Aluminum" thickness = "0.02*cm" />
+      </layer>
+      <layer id="4" inner_r = "1.6*cm" inner_z = "7.622*cm" outer_r = "2.3*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="5" inner_r = "1.6*cm" inner_z = "9.522*cm" outer_r = "2.3*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="6" inner_r = "2.0*cm" inner_z = "12.522*cm" outer_r = "2.7*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="7" inner_r = "2.0*cm" inner_z = "18.022*cm" outer_r = "2.7*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="8" inner_r = "6.8*cm" inner_z = "7.622*cm" outer_r = "7.5*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="9" inner_r = "6.8*cm" inner_z = "9.522*cm" outer_r = "7.5*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="10" inner_r = "6.8*cm" inner_z = "12.522*cm" outer_r = "7.5*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+      <layer id="11" inner_r = "6.8*cm" inner_z = "18.022*cm" outer_r = "7.5*cm">
+	<slice material = "Beryllium" thickness = "0.1*cm" />
+      </layer>
+    </detector>
+
+
+    <!-- Barrel Tracker Supports -->
+
+    <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
+      <layer id="1" inner_r = "18.000*cm" outer_z = "26.7*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness="0.025*cm" />
+      </layer>
+      <layer id="2" inner_r = "44.300*cm" outer_z = "61.7*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness="0.025*cm" />
+      </layer>
+      <layer id="3" inner_r = "70.500*cm" outer_z = "96.7*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness="0.025*cm" />
+      </layer>
+      <layer id="4" inner_r = "96.800*cm" outer_z = "131.7*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness="0.025*cm" />
+      </layer>
+      <layer id="5" inner_r = "119.300*cm" outer_z = "161.7*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness="0.025*cm" />
+      </layer>
+    </detector>
+
+    <!-- Barrel Tracker Modules -->
+
+    <detector id="3" name="TrackerBarrel" type="MultiLayerTracker"  readout="TkrBarrHits">
+      <layer id="1" inner_r = "20.000*cm" outer_z = "26.7*cm">
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*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="2" inner_r = "46.300*cm" outer_z = "61.7*cm">
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*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 = "72.500*cm" outer_z = "96.7*cm">
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*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="4" inner_r = "98.800*cm" outer_z = "131.7*cm">
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*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="5" inner_r = "121.300*cm" outer_z = "161.7*cm">
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*cm" />
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" thickness = "0.00048*cm" />
+	<slice material = "Kapton" thickness = "0.0091*cm" />
+	<slice material = "Copper" thickness = "0.00093*cm" />
+      </layer>
+    </detector>
+
+    <!-- Endcap Tracker Supports -->
+
+    <detector id="0" name="TrackerEndcapSupports" type="DiskTracker" reflect="true">
+      <layer id="1" inner_r = "4.0*cm" inner_z = "27.0*cm" outer_r = "25.000*cm">
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+	<slice material = "Rohacell31" thickness = "2.5*cm" />
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+      </layer>
+      <layer id="2" inner_r = "7.9*cm" inner_z = "62.0*cm" outer_r = "51.300*cm">
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+	<slice material = "Rohacell31" thickness = "2.5*cm" />
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+      </layer>
+      <layer id="3" inner_r = "11.8*cm" inner_z = "97.0*cm" outer_r = "77.500*cm">
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+	<slice material = "Rohacell31" thickness = "2.5*cm" />
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+      </layer>
+      <layer id="4" inner_r = "15.6*cm" inner_z = "132.0*cm" outer_r = "103.800*cm">
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+	<slice material = "Rohacell31" thickness = "2.5*cm" />
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+      </layer>
+      <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "126.300*cm">
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+	<slice material = "Rohacell31" thickness = "2.5*cm" />
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+      </layer>
+    </detector>
+
+    <!-- Endcap Tracker Modules -->
+
+    <detector id="4" name="TrackerEndcap" type="DiskTracker" reflect="true" readout="TkrEndcapHits">
+      <layer id="1" inner_r = "4.0*cm" inner_z = "30.0*cm" outer_r = "25.000*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" />
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*cm" />
+      </layer>
+      <layer id="2" inner_r = "4.0*cm" inner_z = "30.4*cm" outer_r = "25.000*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.9*cm" inner_z = "65.0*cm" outer_r = "51.300*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" />
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*cm" />
+      </layer>
+      <layer id="4" inner_r = "7.9*cm" inner_z = "65.4*cm" outer_r = "51.300*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="5" inner_r = "11.8*cm" inner_z = "100.0*cm" outer_r = "77.500*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" />
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*cm" />
+      </layer>
+      <layer id="6" inner_r = "11.8*cm" inner_z = "100.4*cm" outer_r = "77.500*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="7" inner_r = "15.6*cm" inner_z = "135.0*cm" outer_r = "103.800*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" />
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*cm" />
+      </layer>
+      <layer id="8" inner_r = "15.6*cm" inner_z = "135.4*cm" outer_r = "103.800*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="9" inner_r = "18.9*cm" inner_z = "165.0*cm" outer_r = "126.300*cm" >
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" thickness = "0.00048*cm" />
+	<slice material = "Kapton" thickness = "0.0091*cm" />
+	<slice material = "Copper" thickness = "0.00093*cm" />
+	<slice material = "PEEK" thickness = "0.02*cm" />
+	<slice material = "Rohacell31" thickness="0.14*cm" />
+	<slice material = "Epoxy" thickness="0.0175*cm" />
+	<slice material = "CarbonFiber" thickness=".016*cm" />
+      </layer>
+      <layer id="10" inner_r = "18.9*cm" inner_z = "165.4*cm" outer_r = "126.300*cm" >
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" thickness = "0.00048*cm" />
+	<slice material = "Kapton" thickness = "0.0091*cm" />
+	<slice material = "Copper" thickness = "0.00093*cm" />
+      </layer>
+    </detector>
+
+    <!-- Tracker Support Rings -->
+
+    <detector id="0" name="TrackerSupportRings" type="DiskTracker" reflect="true">
+      <layer id="1" inner_r = "18.000*cm" inner_z = "26.7*cm" outer_r = "44.300*cm">
+	<slice material = "CarbonFiber" thickness = "0.15*cm" />
+      </layer>
+      <layer id="2" inner_r = "44.300*cm" inner_z = "61.7*cm" outer_r = "70.500*cm">
+	<slice material = "CarbonFiber" thickness = "0.15*cm" />
+      </layer>
+      <layer id="3" inner_r = "70.500*cm" inner_z = "96.7*cm" outer_r = "96.800*cm">
+	<slice material = "CarbonFiber" thickness = "0.15*cm" />
+      </layer>
+      <layer id="4" inner_r = "96.800*cm" inner_z = "131.7*cm" outer_r = "119.300*cm">
+	<slice material = "CarbonFiber" thickness = "0.15*cm" />
+      </layer>
+      <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
+	<slice material = "CarbonFiber" thickness = "0.15*cm" />
+      </layer>
+    </detector>
+
+    <!-- Tracker Readout/Power Distribution System -->
+
+    <detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
+      <layer id="1" inner_r = "25.500*cm" inner_z = "27.0*cm" outer_r = "44.300*cm">
+	<slice material = "G10" thickness = "0.057*cm" />
+	<slice material = "Copper" thickness = "0.0038*cm" />
+      </layer>
+      <layer id="2" inner_r = "51.800*cm" inner_z = "62.0*cm" outer_r = "70.500*cm">
+	<slice material = "G10" thickness = "0.102*cm" />
+	<slice material = "Copper" thickness = "0.0068*cm" />
+      </layer>
+      <layer id="3" inner_r = "78.000*cm" inner_z = "97.0*cm" outer_r = "96.800*cm">
+	<slice material = "G10" thickness = "0.108*cm" />
+	<slice material = "Copper" thickness = "0.0072*cm" />
+      </layer>
+      <layer id="4" inner_r = "104.300*cm" inner_z = "132.0*cm" outer_r = "119.300*cm">
+	<slice material = "G10" thickness = "0.186*cm" />
+	<slice material = "Copper" thickness = "0.0124*cm" />
+      </layer>
+      <layer id="5" inner_r = "104.300*cm" inner_z = "167.0*cm" outer_r = "119.300*cm">
+	<slice material = "G10" thickness = "0.246*cm" />
+	<slice material = "Copper" thickness = "0.0164*cm" />
+      </layer>
+    </detector>
+
+    <!-- Electromagnetic calorimeter -->
 
     <detector id="5" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
-         <dimensions inner_r = "127.0*cm" outer_z = "182.0*cm" />
-         <layer repeat="20">
-           <slice material = "Tungsten" thickness = "0.25*cm" />
-           <slice material = "G10" thickness = "0.068*cm" />
-           <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-           <slice material = "Air" thickness = "0.025*cm" />
-         </layer>
-         <layer repeat="10">
-           <slice material = "Tungsten" thickness = "0.50*cm" />
-           <slice material = "G10" thickness = "0.068*cm" />
-           <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-           <slice material = "Air" thickness = "0.025*cm" />
-         </layer>
+      <dimensions inner_r = "127.0*cm" outer_z = "182.0*cm" />
+      <layer repeat="20">
+	<slice material = "Tungsten" thickness = "0.25*cm" />
+	<slice material = "G10" thickness = "0.068*cm" />
+	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+	<slice material = "Air" thickness = "0.025*cm" />
+      </layer>
+      <layer repeat="10">
+	<slice material = "Tungsten" thickness = "0.50*cm" />
+	<slice material = "G10" thickness = "0.068*cm" />
+	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+	<slice material = "Air" thickness = "0.025*cm" />
+      </layer>
     </detector>
 
     <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
-        <dimensions inner_r = "26.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
-        <layer repeat="20">
-          <slice material = "Tungsten" thickness = "0.25*cm" />
-          <slice material = "G10" thickness = "0.068*cm" />
-          <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-          <slice material = "Air" thickness = "0.025*cm" />
-        </layer>
-        <layer repeat="10">
-          <slice material = "Tungsten" thickness = "0.50*cm" />
-          <slice material = "G10" thickness = "0.068*cm" />
-          <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-          <slice material = "Air" thickness = "0.025*cm" />
-        </layer>
+      <dimensions inner_r = "26.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
+      <layer repeat="20">
+	<slice material = "Tungsten" thickness = "0.25*cm" />
+	<slice material = "G10" thickness = "0.068*cm" />
+	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+	<slice material = "Air" thickness = "0.025*cm" />
+      </layer>
+      <layer repeat="10">
+	<slice material = "Tungsten" thickness = "0.50*cm" />
+	<slice material = "G10" thickness = "0.068*cm" />
+	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+	<slice material = "Air" thickness = "0.025*cm" />
+      </layer>
     </detector>
 
-<!-- Hadronic calorimeter -->
+    <!-- Hadronic calorimeter -->
 
     <detector id="7" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">
-         <dimensions inner_r = "141.0*cm" outer_z = "277.2*cm" />
-         <layer repeat="34">
-           <slice material = "Steel235" thickness = "2.0*cm" />
-           <slice material = "G10" thickness = "0.3*cm" />
-           <slice material = "PyrexGlass" thickness = "0.11*cm" />
-           <slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" />
-           <slice material = "PyrexGlass" thickness = "0.11*cm" />
-           <slice material = "Air" thickness = "0.16*cm" />
-         </layer>
+      <dimensions inner_r = "141.0*cm" outer_z = "277.2*cm" />
+      <layer repeat="34">
+	<slice material = "Steel235" thickness = "2.0*cm" />
+	<slice material = "G10" thickness = "0.3*cm" />
+	<slice material = "PyrexGlass" thickness = "0.11*cm" />
+	<slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" />
+	<slice material = "PyrexGlass" thickness = "0.11*cm" />
+	<slice material = "Air" thickness = "0.16*cm" />
+      </layer>
     </detector>
 
     <detector id ="8" name="HADEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits">
-        <dimensions inner_r = "26.0*cm" inner_z = "182.0*cm" outer_r = "140.75*cm" />
-        <layer repeat="34" >
-           <slice material = "Steel235" thickness = "2.0*cm" />
-           <slice material = "G10" thickness = "0.3*cm" />
-           <slice material = "PyrexGlass" thickness = "0.11*cm" />
-           <slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" />
-           <slice material = "PyrexGlass" thickness = "0.11*cm" />
-           <slice material = "Air" thickness = "0.16*cm" />
-        </layer>
-    </detector>
-
-<!-- Solenoid -->
- <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
- <layer id="1" inner_r="250.0*cm" outer_z="271.0*cm">
-  <slice material="Steel235" thickness="6.0*cm" />
-  <slice material="Air" thickness="8.5*cm" />
-  </layer>
- <layer id="2" inner_r="264.5*cm" outer_z="262.5*cm">
-  <slice material="Aluminum" thickness="39.3*cm" />
-  <slice material="Steel235" thickness="6.0*cm" />
-  </layer>
- <layer id="3" inner_r="309.8*cm" outer_z="271.0*cm">
-  <slice material="Air" thickness="20.0*cm" />
-  <slice material="Steel235" thickness="3.0*cm" />
-  </layer>
-  </detector>
-
- <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
- <layer id="1" inner_r="250.0*cm" inner_z="271.0*cm" outer_r="332.8*cm">
-  <slice material="Steel235" thickness="6.0*cm" />
-  </layer>
-  </detector>
-
-
- <!--  Muon system  -->
- <detector id="9" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits">
-  <dimensions inner_r="333.0*cm" outer_z="277.0*cm" />
- <layer repeat="48">
-  <slice material="Iron" thickness="5.0*cm" />
-  <slice material="G10" thickness="0.3*cm" />
-  <slice material="PyrexGlass" thickness="0.11*cm" />
-  <slice material="RPCGasDefault" thickness="0.12*cm" sensitive="yes" />
-  <slice material="PyrexGlass" thickness="0.11*cm" />
-  <slice material="Air" thickness="0.86*cm" />
-  </layer>
-  </detector>
-
- <detector id="10" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">
-  <dimensions inner_r = "26.0*cm" inner_z = "277.5*cm" outer_r = "645.0*cm" />
- <layer repeat="48">
-  <slice material="Iron" thickness="5.0*cm" />
-  <slice material="G10" thickness="0.3*cm" />
-  <slice material="PyrexGlass" thickness="0.11*cm" />
-  <slice material="RPCGasDefault" thickness="0.12*cm" sensitive="yes" />
-  <slice material="PyrexGlass" thickness="0.11*cm" />
-  <slice material="Air" thickness="0.86*cm" />
-    </layer>
-  </detector>
+      <dimensions inner_r = "26.0*cm" inner_z = "182.0*cm" outer_r = "140.75*cm" />
+      <layer repeat="34" >
+	<slice material = "Steel235" thickness = "2.0*cm" />
+	<slice material = "G10" thickness = "0.3*cm" />
+	<slice material = "PyrexGlass" thickness = "0.11*cm" />
+	<slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" />
+	<slice material = "PyrexGlass" thickness = "0.11*cm" />
+	<slice material = "Air" thickness = "0.16*cm" />
+      </layer>
+    </detector>
+
+    <!-- Solenoid -->
+    <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
+      <layer id="1" inner_r="250.0*cm" outer_z="271.0*cm">
+	<slice material="Steel235" thickness="6.0*cm" />
+	<slice material="Air" thickness="8.5*cm" />
+      </layer>
+      <layer id="2" inner_r="264.5*cm" outer_z="262.5*cm">
+	<slice material="Aluminum" thickness="39.3*cm" />
+	<slice material="Steel235" thickness="6.0*cm" />
+      </layer>
+      <layer id="3" inner_r="309.8*cm" outer_z="271.0*cm">
+	<slice material="Air" thickness="20.0*cm" />
+	<slice material="Steel235" thickness="3.0*cm" />
+      </layer>
+    </detector>
+
+    <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
+      <layer id="1" inner_r="250.0*cm" inner_z="271.0*cm" outer_r="332.8*cm">
+	<slice material="Steel235" thickness="6.0*cm" />
+      </layer>
+    </detector>
+
+
+    <!--  Muon system  -->
+    <detector id="9" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits">
+      <dimensions inner_r="333.0*cm" outer_z="277.0*cm" />
+      <layer repeat="48">
+	<slice material="Iron" thickness="5.0*cm" />
+	<slice material="G10" thickness="0.3*cm" />
+	<slice material="PyrexGlass" thickness="0.11*cm" />
+	<slice material="RPCGasDefault" thickness="0.12*cm" sensitive="yes" />
+	<slice material="PyrexGlass" thickness="0.11*cm" />
+	<slice material="Air" thickness="0.86*cm" />
+      </layer>
+    </detector>
+
+    <detector id="10" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">
+      <dimensions inner_r = "26.0*cm" inner_z = "277.5*cm" outer_r = "645.0*cm" />
+      <layer repeat="48">
+	<slice material="Iron" thickness="5.0*cm" />
+	<slice material="G10" thickness="0.3*cm" />
+	<slice material="PyrexGlass" thickness="0.11*cm" />
+	<slice material="RPCGasDefault" thickness="0.12*cm" sensitive="yes" />
+	<slice material="PyrexGlass" thickness="0.11*cm" />
+	<slice material="Air" thickness="0.86*cm" />
+      </layer>
+    </detector>
 
 
-<!-- Forward Masks -->
-<!-- sensitive calorimeter same as EM end cap -->
+    <!-- Forward Masks -->
+    <!-- sensitive calorimeter same as EM end cap -->
 
     <detector id="11" name="ForwardEMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="ForwardEcalEndcapHits">
-        <dimensions inner_r = "8.69*cm" inner_z = "168.0*cm" outer_r = "25.0*cm" />
-        <layer repeat="20" >
-          <slice material = "Tungsten" thickness = "0.25*cm" />
-          <slice material = "G10" thickness = "0.068*cm" />
-          <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-          <slice material = "Air" thickness = "0.025*cm" />
-        </layer>
-        <layer repeat="10" >
-          <slice material = "Tungsten" thickness = "0.50*cm" />
-          <slice material = "G10" thickness = "0.068*cm" />
-          <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-          <slice material = "Air" thickness = "0.025*cm" />
-        </layer>
+      <dimensions inner_r = "8.69*cm" inner_z = "168.0*cm" outer_r = "25.0*cm" />
+      <layer repeat="20" >
+	<slice material = "Tungsten" thickness = "0.25*cm" />
+	<slice material = "G10" thickness = "0.068*cm" />
+	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+	<slice material = "Air" thickness = "0.025*cm" />
+      </layer>
+      <layer repeat="10" >
[truncated at 1000 lines; 166 more skipped]
CVSspam 0.2.8