Commit in LCDetectors/detectors/sid01_planar_tracker on MAIN
compact.xml+512-5021.4 -> 1.5
JM: working version corrections

LCDetectors/detectors/sid01_planar_tracker
compact.xml 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- compact.xml	29 Apr 2008 22:11:45 -0000	1.4
+++ compact.xml	29 Apr 2008 22:28:05 -0000	1.5
@@ -7,7 +7,7 @@
         title="Silicon Detector v01 with Planar Trackers"
         author="Jeremy McCormick and Tim Nelson"
         status="development"
-        version="$Id: compact.xml,v 1.4 2008/04/29 22:11:45 tknelson Exp $">
+        version="$Id: compact.xml,v 1.5 2008/04/29 22:28:05 jeremy Exp $">
     <comment></comment>
   </info>
 
@@ -102,7 +102,7 @@
               rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.3992*cm)" 
               z="tracking_region_zmax" />
     </detector> 
-   
+    
     <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
       <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" />
@@ -160,131 +160,129 @@
       <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
     </detector>
 
-
-
-    <detector id="11" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrel_RO" vis="VertexVis">
-      <module name="VtxBarrelModuleInner">
-	<module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
-	<module_component width="7.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
-	  <position z="-0.08"/>
-	</module_component>
-	<module_component width="7.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
-	  <position z="0.075"/>
-	</module_component>
-	<module_component width="9.6" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
-	  <position z="0.150"/>
-	</module_component>
-      </module>
-      <module name="VtxBarrelModuleOuter">
-	<module_envelope width="14.0" length="126.0" thickness="0.6"/>
-	<module_component width="11.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
-	  <position z="-0.08"/>
-	</module_component>
-	<module_component width="11.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
-	  <position z="0.075"/>
-	</module_component>
-	<module_component width="13.8" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
-	  <position z="0.150"/>
-	</module_component>
-      </module>
-      <layer module="VtxBarrelModuleInner" id="1">
-	<barrel_envelope inner_r="13.0" outer_r="17.0" z_length="63 * 2"/>
-	<rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="15.05" dr="-1.15"/>
-	<z_layout dr="0.0" z0="0.0" nz="1"/>
-      </layer>
-      <layer module="VtxBarrelModuleOuter" id="2">
-	<barrel_envelope inner_r="21.0" outer_r="25.0" z_length="63 * 2"/>
-	<rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="23.03" dr="-1.13"/>
-	<z_layout dr="0.0" z0="0.0" nz="1"/>
-      </layer>
-      <layer module="VtxBarrelModuleOuter" id="3">
-	<barrel_envelope inner_r="34.0" outer_r="38.0" z_length="63 * 2"/>
-	<rphi_layout phi_tilt="0.0" nphi="18" phi0="0.0" rc="35.79" dr="-0.89"/>
-	<z_layout dr="0.0" z0="0.0" nz="1"/>
-      </layer>
-      <layer module="VtxBarrelModuleOuter" id="4">
-	<barrel_envelope inner_r="46.6" outer_r="50.6" z_length="63 * 2"/>
-	<rphi_layout phi_tilt="0.0" nphi="24" phi0="0.1309" rc="47.5" dr="0.81"/>
-	<z_layout dr="0.0" z0="0.0" nz="1"/>
-      </layer>
-      <layer module="VtxBarrelModuleOuter" id="5">
-	<barrel_envelope inner_r="59.0" outer_r="63.0" z_length="63 * 2"/>
-	<rphi_layout phi_tilt="0.0" nphi="30" phi0="0.0" rc="59.9" dr="0.77"/>
-	<z_layout dr="0.0" z0="0.0" nz="1"/>
-      </layer>
+    <detector id="11" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrel_RO">
+      <module name="VtxBarrelModuleInner">
+        <module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
+        <module_component width="7.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
+          <position z="-0.08"/>
+        </module_component>
+        <module_component width="7.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
+          <position z="0.075"/>
+        </module_component>
+        <module_component width="9.6" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
+          <position z="0.150"/>
+        </module_component>
+      </module>
+      <module name="VtxBarrelModuleOuter">
+        <module_envelope width="14.0" length="126.0" thickness="0.6"/>
+        <module_component width="11.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
+          <position z="-0.08"/>
+        </module_component>
+        <module_component width="11.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
+          <position z="0.075"/>
+        </module_component>
+        <module_component width="13.8" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
+          <position z="0.150"/>
+        </module_component>
+      </module>
+      <layer module="VtxBarrelModuleInner" id="1">
+        <barrel_envelope inner_r="13.0" outer_r="17.0" z_length="63 * 2"/>
+        <rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="15.05" dr="-1.15"/>
+        <z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="2">
+        <barrel_envelope inner_r="21.0" outer_r="25.0" z_length="63 * 2"/>
+        <rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="23.03" dr="-1.13"/>
+        <z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="3">
+        <barrel_envelope inner_r="34.0" outer_r="38.0" z_length="63 * 2"/>
+        <rphi_layout phi_tilt="0.0" nphi="18" phi0="0.0" rc="35.79" dr="-0.89"/>
+        <z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="4">
+        <barrel_envelope inner_r="46.6" outer_r="50.6" z_length="63 * 2"/>
+        <rphi_layout phi_tilt="0.0" nphi="24" phi0="0.1309" rc="47.5" dr="0.81"/>
+        <z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="5">
+        <barrel_envelope inner_r="59.0" outer_r="63.0" z_length="63 * 2"/>
+        <rphi_layout phi_tilt="0.0" nphi="30" phi0="0.0" rc="59.9" dr="0.77"/>
+        <z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
     </detector>
 
-<!--
-    <detector id="11" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits" combineHits="true">
-      <layer id="1" inner_r = "1.461*cm" outer_z = "6.25*cm">
+    <!--
+        <detector id="11" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits" combineHits="true">
+        <layer id="1" inner_r = "1.461*cm" outer_z = "6.25*cm">
         <slice material = "Silicon" thickness = "0.0093*cm"/>
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-      </layer>
-      <layer id="2" inner_r = "2.261*cm" outer_z = "6.25*cm">
+        </layer>
+        <layer id="2" inner_r = "2.261*cm" outer_z = "6.25*cm">
         <slice material = "Silicon" thickness = "0.0093*cm"/>
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-      </layer>
-      <layer id="3" inner_r = "3.541*cm" outer_z = "6.25*cm">
+        </layer>
+        <layer id="3" inner_r = "3.541*cm" outer_z = "6.25*cm">
         <slice material = "Silicon" thickness = "0.0093*cm"/>
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-      </layer>
-      <layer id="4" inner_r = "4.801*cm" outer_z = "6.25*cm" >
+        </layer>
+        <layer id="4" inner_r = "4.801*cm" outer_z = "6.25*cm" >
         <slice material = "Silicon" thickness = "0.0093*cm"/>
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-      </layer>
-      <layer id="5" inner_r = "6.041*cm" outer_z = "6.25*cm">
+        </layer>
+        <layer id="5" inner_r = "6.041*cm" outer_z = "6.25*cm">
         <slice material = "Silicon" thickness = "0.0093*cm"/>
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
+        </layer>
+        </detector>
+    -->
+
+    <detector id="12" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcap_RO">
+      
+      <module name="SiVertexEndcapModule">
+        <module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
+        <module_component thickness="0.0093*cm"   material="Silicon" />        
+      </module>
+
+      <layer id="1" inner_r="1.4*cm" outer_r="7.1*cm" inner_z="7.18*cm" thickness="0.02*cm" nwedges="12">
+        <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
       </layer>
-    </detector>
--->
 
-        <detector id="12" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcap_RO" vis="TestVis">
-            
-            <module name="SiVertexEndcapModule">
-                <module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
-                <module_component thickness="0.0093*cm"   material="Silicon" />        
-            </module>
-
-            <layer id="1" inner_r="1.4*cm" outer_r="7.1*cm" inner_z="7.18*cm" thickness="0.02*cm" nwedges="12">
-                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
-            </layer>
-
-            <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.02*cm" nwedges="12">
-                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
-            </layer>
-
-            <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.02*cm" nwedges="12">
-                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
-            </layer>
-
-            <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.02*cm" nwedges="12">
-                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
-            </layer>
+      <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.02*cm" nwedges="12">
+        <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+      </layer>
 
-        </detector>
+      <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.02*cm" nwedges="12">
+        <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+      </layer>
 
+      <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.02*cm" nwedges="12">
+        <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+      </layer>
+
+    </detector>
 
-<!--
-    <detector id="12" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VtxEndcapHits" combineHits="true">
-      <layer id="1" inner_r = "1.4*cm" inner_z = "7.18*cm" outer_r = "7.1*cm">
+
+    <!--
+        <detector id="12" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VtxEndcapHits" combineHits="true">
+        <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.02*cm" outer_r = "7.1*cm">
+        </layer>
+        <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 = "1.8*cm" inner_z = "12.16*cm" outer_r = "7.1*cm">
+        </layer>
+        <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 = "17.0*cm" outer_r = "7.1*cm" >
+        </layer>
+        <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>
-    </detector>
--->
+        </layer>
+        </detector>
+    -->
 
     <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
       <layer id="1" inner_r = "1.43*cm" outer_z = "6.27*cm">
@@ -641,7 +639,7 @@
         <rphi_layout phi_tilt="0.17506" nphi="20" phi0="0." rc="216.355 + 5.0" dr="0.0"/>
         <z_layout dr="4.0" z0="512.0" nz="13"/>
       </layer>    
-     
+      
       <layer module="SiTrackerModule_Layer1">
         <barrel_envelope inner_r="465.075" outer_r="501.0" z_length="825.0 * 2.0 + 10.0"/>
         <rphi_layout phi_tilt="0.12217" nphi="38" phi0="0.087" rc="466.355 + 5.0" dr="0.0"/>
@@ -653,7 +651,7 @@
         <rphi_layout phi_tilt="0.11493" nphi="58" phi0="0.058" rc="716.355 + 5.0" dr="0.0"/>
         <z_layout dr="4.0" z0="1037.0" nz="25"/>
       </layer>
-   
+      
 
       <layer module="SiTrackerModule_Layer3">
         <barrel_envelope inner_r="965.075" outer_r="1012.0" z_length="1347.0 * 2.0 + 10.0"/>
@@ -661,7 +659,7 @@
         <z_layout dr="4.0" z0="1301.0" nz="31"/>
       </layer>
       
- 
+      
       <layer module="SiTrackerModule_Layer4">
         <barrel_envelope inner_r="1215.075" outer_r="1265.0" z_length="1606.0 * 2.0 + 10.0"/>
         <rphi_layout phi_tilt="0.11467" nphi="102" phi0="0.01745" rc="1216.355 + 5.0" dr="0.0"/>
@@ -670,9 +668,9 @@
 
     </detector>
 
-<!--
-    <detector id="13" name="TrackerBarrel" type="MultiLayerTracker"  readout="TkrBarrHits" combineHits="true">
-      <layer id="1" inner_r = "21.800*cm" outer_z = "55.8*cm">
+    <!--
+        <detector id="13" name="TrackerBarrel" type="MultiLayerTracker"  readout="TkrBarrHits" combineHits="true">
+        <layer id="1" inner_r = "21.800*cm" outer_z = "55.8*cm">
         <slice material = "PEEK" thickness = "0.02*cm" />
         <slice material = "Rohacell31_50percent" thickness="0.28*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
@@ -681,8 +679,8 @@
         <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.800*cm" outer_z = "82.5*cm">
+        </layer>
+        <layer id="2" inner_r = "46.800*cm" outer_z = "82.5*cm">
         <slice material = "PEEK" thickness = "0.02*cm" />
         <slice material = "Rohacell31_50percent" thickness="0.28*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
@@ -691,8 +689,8 @@
         <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 = "71.800*cm" outer_z = "108.3*cm">
+        </layer>
+        <layer id="3" inner_r = "71.800*cm" outer_z = "108.3*cm">
         <slice material = "PEEK" thickness = "0.02*cm" />
         <slice material = "Rohacell31_50percent" thickness="0.28*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
@@ -701,8 +699,8 @@
         <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 = "96.800*cm" outer_z = "134.7*cm">
+        </layer>
+        <layer id="4" inner_r = "96.800*cm" outer_z = "134.7*cm">
         <slice material = "PEEK" thickness = "0.02*cm" />
         <slice material = "Rohacell31_50percent" thickness="0.28*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
@@ -711,8 +709,8 @@
         <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.800*cm" outer_z = "160.6*cm">
+        </layer>
+        <layer id="5" inner_r = "121.800*cm" outer_z = "160.6*cm">
         <slice material = "PEEK" thickness = "0.02*cm" />
         <slice material = "Rohacell31_50percent" thickness="0.28*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
@@ -721,9 +719,9 @@
         <slice material = "Silicon" thickness = "0.00048*cm" />
         <slice material = "Kapton" thickness = "0.0091*cm" />
         <slice material = "Copper" thickness = "0.00093*cm" />
-      </layer>
-    </detector>
--->
+        </layer>
+        </detector>
+    -->
 
     <detector id="0" name="TrackerEndcapSupports" type="DiskTracker" reflect="true" >
       <layer id="1" inner_r = "20.5*cm" inner_z = "84.5*cm" outer_r = "51.0*cm">
@@ -749,91 +747,91 @@
     </detector>
 
 
-        <detector id="14" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO" vis="TestVis">
-            
-            <module name="SiTrackerEndcapModule_Layer0">
-                <module_component thickness="0.00052*cm"   material="Copper" />        
-                <module_component thickness="0.0051*cm"   material="Kapton" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.00048*cm" material="Silicon" />        
-                <module_component thickness="0.0051*cm"   material="Kapton" />
-                <module_component thickness="0.00052*cm"   material="Copper" />
-            </module>
-            
-            <module name="SiTrackerEndcapModule_Layer1">
-                <module_component thickness="0.00065*cm"   material="Copper" />        
-                <module_component thickness="0.0064*cm"   material="Kapton" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.00048*cm" material="Silicon" />        
-                <module_component thickness="0.0064*cm"   material="Kapton" />
-                <module_component thickness="0.00065*cm"   material="Copper" />
-            </module>
-            
-            <module name="SiTrackerEndcapModule_Layer2">
-                <module_component thickness="0.00079*cm"   material="Copper" />        
-                <module_component thickness="0.0078*cm"   material="Kapton" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.00048*cm" material="Silicon" />        
-                <module_component thickness="0.0078*cm"   material="Kapton" />
-                <module_component thickness="0.00079*cm"   material="Copper" />
-            </module>
-            
-            <module name="SiTrackerEndcapModule_Layer3">
-                <module_component thickness="0.00052*cm"   material="Copper" />        
-                <module_component thickness="0.0093*cm"   material="Kapton" />
-                <module_component thickness="0.00091*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.00048*cm" material="Silicon" />        
-                <module_component thickness="0.0091*cm"   material="Kapton" />
-                <module_component thickness="0.00093*cm"   material="Copper" />
-            </module>
-            
-            <!-- Endcap Tracker Layers -->
-            <layer id="4" inner_r="207.0" outer_r="499.0" inner_z="855.0" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="84.0" phi_size_max="80" />
-            </layer>
-            
-            <layer id="5" inner_r="207.0" outer_r="751.0" inner_z="1114.0" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerEndcapModule_Layer1" r_size="84.0" phi_size_max="80" />
-            </layer>
-            
-            <layer id="6" inner_r="207.0" outer_r="1003.0" inner_z="1378.0" thickness="10.0" nwedges="24">		
-                <module_parameters module="SiTrackerEndcapModule_Layer2" r_size="84.0" phi_size_max="80" />
-            </layer>
-            
-            <layer id="7" inner_r="207.0" outer_r="1255.0" inner_z="1636.0" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerEndcapModule_Layer3" r_size="84.0" phi_size_max="80" />
-            </layer>
-            
-        </detector>
+    <detector id="14" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO">
+      
+      <module name="SiTrackerEndcapModule_Layer0">
+        <module_component thickness="0.00052*cm"   material="Copper" />        
+        <module_component thickness="0.0051*cm"   material="Kapton" />
+        <module_component thickness="0.00048*cm" material="Silicon" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.18*cm" material="Rohacell31_50D" />
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.0175*cm" material="Epoxy" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.00048*cm" material="Silicon" />        
+        <module_component thickness="0.0051*cm"   material="Kapton" />
+        <module_component thickness="0.00052*cm"   material="Copper" />
+      </module>
+      
+      <module name="SiTrackerEndcapModule_Layer1">
+        <module_component thickness="0.00065*cm"   material="Copper" />        
+        <module_component thickness="0.0064*cm"   material="Kapton" />
+        <module_component thickness="0.00048*cm" material="Silicon" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.18*cm" material="Rohacell31_50D" />
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.0175*cm" material="Epoxy" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.00048*cm" material="Silicon" />        
+        <module_component thickness="0.0064*cm"   material="Kapton" />
+        <module_component thickness="0.00065*cm"   material="Copper" />
+      </module>
+      
+      <module name="SiTrackerEndcapModule_Layer2">
+        <module_component thickness="0.00079*cm"   material="Copper" />        
+        <module_component thickness="0.0078*cm"   material="Kapton" />
+        <module_component thickness="0.00048*cm" material="Silicon" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.18*cm" material="Rohacell31_50D" />
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.0175*cm" material="Epoxy" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.00048*cm" material="Silicon" />        
+        <module_component thickness="0.0078*cm"   material="Kapton" />
+        <module_component thickness="0.00079*cm"   material="Copper" />
+      </module>
+      
+      <module name="SiTrackerEndcapModule_Layer3">
+        <module_component thickness="0.00052*cm"   material="Copper" />        
+        <module_component thickness="0.0093*cm"   material="Kapton" />
+        <module_component thickness="0.00091*cm" material="Silicon" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.18*cm" material="Rohacell31_50D" />
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.0175*cm" material="Epoxy" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.00048*cm" material="Silicon" />        
+        <module_component thickness="0.0091*cm"   material="Kapton" />
+        <module_component thickness="0.00093*cm"   material="Copper" />
+      </module>
+      
+      <!-- Endcap Tracker Layers -->
+      <layer id="4" inner_r="207.0" outer_r="499.0" inner_z="855.0" thickness="10.0" nwedges="24">
+        <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="84.0" phi_size_max="80" />
+      </layer>
+      
+      <layer id="5" inner_r="207.0" outer_r="751.0" inner_z="1114.0" thickness="10.0" nwedges="24">
+        <module_parameters module="SiTrackerEndcapModule_Layer1" r_size="84.0" phi_size_max="80" />
+      </layer>
+      
+      <layer id="6" inner_r="207.0" outer_r="1003.0" inner_z="1378.0" thickness="10.0" nwedges="24">		
+        <module_parameters module="SiTrackerEndcapModule_Layer2" r_size="84.0" phi_size_max="80" />
+      </layer>
+      
+      <layer id="7" inner_r="207.0" outer_r="1255.0" inner_z="1636.0" thickness="10.0" nwedges="24">
+        <module_parameters module="SiTrackerEndcapModule_Layer3" r_size="84.0" phi_size_max="80" />
+      </layer>
+      
+    </detector>
 
 
-<!--
-    <detector id="14" name="TrackerEndcap" type="DiskTracker" reflect="true" readout="TkrEndcapHits" combineHits="true">
-      <layer id="1" inner_r = "20.7*cm" inner_z = "85.5*cm" outer_r = "49.4*cm">
+    <!--
+        <detector id="14" name="TrackerEndcap" type="DiskTracker" reflect="true" readout="TkrEndcapHits" combineHits="true">
+        <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" />
@@ -842,14 +840,14 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="2" inner_r = "20.7*cm" inner_z = "85.9*cm" outer_r = "49.4*cm" >
+        </layer>
+        <layer id="2" inner_r = "20.7*cm" inner_z = "85.9*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 = "20.7*cm" inner_z = "111.4*cm" outer_r = "74.7*cm" >
+        </layer>
+        <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" />
@@ -858,14 +856,14 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="4" inner_r = "20.7*cm" inner_z = "111.8*cm" outer_r = "74.7*cm">
+        </layer>
+        <layer id="4" inner_r = "20.7*cm" inner_z = "111.8*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 = "20.7*cm" inner_z = "137.8*cm" outer_r = "99.9*cm">
+        </layer>
+        <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" />
@@ -874,14 +872,14 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="6" inner_r = "20.7*cm" inner_z = "138.2*cm" outer_r = "99.9*cm">
+        </layer>
+        <layer id="6" inner_r = "20.7*cm" inner_z = "138.2*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 = "20.7*cm" inner_z = "163.6*cm" outer_r = "125.0*cm" >
+        </layer>
+        <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" />
@@ -890,15 +888,15 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="8" inner_r = "20.7*cm" inner_z = "164.0*cm" outer_r = "125.0*cm" >
+        </layer>
+        <layer id="8" inner_r = "20.7*cm" inner_z = "164.0*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" />
         <slice material = "Copper" thickness = "0.00093*cm" />
-      </layer>
-    </detector>
--->
+        </layer>
+        </detector>
+    -->
 
     <detector id="0" name="TrackerForwardSupports" type="DiskTracker" reflect="true">
       <layer id="1" inner_r = "2.68*cm" inner_z = "21.18*cm" outer_r = "16.87*cm">
@@ -919,41 +917,41 @@
     </detector>
 
 
-        <detector id="15" name="SiTrackerForward" type="SiTrackerForward" readout="SiTrackerForward_RO" vis="TestVis">
-            
-            <module name="SiTrackerForwardModule">
-                <module_component thickness="0.00038*cm"   material="Copper" />        
-                <module_component thickness="0.0038*cm"   material="Kapton" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
-                <module_component thickness="0.00048*cm" material="Silicon" />        
-                <module_component thickness="0.0038*cm"   material="Kapton" />
-                <module_component thickness="0.00038*cm"   material="Copper" />
-            </module>
-                        
-            <!-- Forward Tracker Layers -->       
-            <layer id="1" inner_r="27.800" outer_r="166.7" inner_z="204.0" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerForwardModule" r_size="41.1" phi_size_max="50" />
-            </layer>
-            
-            <layer id="2" inner_r="75.1" outer_r="166.7" inner_z="538.5" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerForwardModule" r_size="41.1" phi_size_max="50" />
-            </layer>
-            
-            <layer id="3" inner_r="116.5" outer_r="166.7" inner_z="829.5" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerForwardModule" r_size="41.4" phi_size_max="50" />
-            </layer>        
-            
-        </detector>
+    <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForward_RO">
+      
+      <module name="SiTrackerForwardModule">
+        <module_component thickness="0.00038*cm"   material="Copper" />        
+        <module_component thickness="0.0038*cm"   material="Kapton" />
+        <module_component thickness="0.00048*cm" material="Silicon" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.18*cm" material="Rohacell31_50D" />
+        <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
+        <module_component thickness="0.0175*cm" material="Epoxy" />
+        <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />        
+        <module_component thickness="0.00048*cm" material="Silicon" />        
+        <module_component thickness="0.0038*cm"   material="Kapton" />
+        <module_component thickness="0.00038*cm"   material="Copper" />
+      </module>
+      
+      <!-- Forward Tracker Layers -->       
+      <layer id="1" inner_r="27.800" outer_r="166.7" inner_z="204.0" thickness="10.0" nwedges="24">
+        <module_parameters module="SiTrackerForwardModule" r_size="41.1" phi_size_max="50" />
+      </layer>
+      
+      <layer id="2" inner_r="75.1" outer_r="166.7" inner_z="538.5" thickness="10.0" nwedges="24">
+        <module_parameters module="SiTrackerForwardModule" r_size="41.1" phi_size_max="50" />
+      </layer>
+      
+      <layer id="3" inner_r="116.5" outer_r="166.7" inner_z="829.5" thickness="10.0" nwedges="24">
+        <module_parameters module="SiTrackerForwardModule" r_size="41.4" phi_size_max="50" />
+      </layer>        
+      
+    </detector>
 
-<!--
-    <detector id="15" name="TrackerForward" type="DiskTracker" reflect="true" readout="TkrForwardHits">
-      <layer id="1" inner_r = "2.78*cm" inner_z = "20.4*cm" outer_r = "16.67*cm">
+    <!--
+        <detector id="15" name="TrackerForward" type="DiskTracker" reflect="true" readout="TkrForwardHits">
+        <layer id="1" inner_r = "2.78*cm" inner_z = "20.4*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" />
@@ -962,14 +960,14 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="2" inner_r = "2.78*cm" inner_z = "20.80*cm" outer_r = "16.67*cm">
+        </layer>
+        <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.51*cm" inner_z = "53.85*cm" outer_r = "16.67*cm">
+        </layer>
+        <layer id="3" inner_r = "7.51*cm" inner_z = "53.85*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" />
@@ -978,14 +976,14 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="4" inner_r = "7.51*cm" inner_z = "54.25*cm" outer_r = "16.67*cm">
+        </layer>
+        <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.65*cm" inner_z = "82.95*cm" outer_r = "16.67*cm">
+        </layer>
+        <layer id="5" inner_r = "11.65*cm" inner_z = "82.95*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" />
@@ -994,252 +992,252 @@
         <slice material = "Rohacell31_50percent" thickness="0.3*cm" />
         <slice material = "Epoxy" thickness="0.0175*cm" />
         <slice material = "CarbonFiber" thickness=".016*cm" />
-      </layer>
-      <layer id="6" inner_r = "11.65*cm" inner_z = "83.35*cm" outer_r = "16.67*cm">
+        </layer>
+        <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" />
         <slice material = "Copper" thickness = "0.00038*cm" />
-      </layer>
-    </detector> 
-
-    <detector id="0" name="TrackerSupportRings" type="DiskTracker" reflect="true">
-      <layer id="1" inner_r = "21.5*cm" inner_z = "57.0*cm" outer_r = "45.6*cm">
-        <slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
-      </layer>
-      <layer id="2" inner_r = "46.5*cm" inner_z = "83.6*cm" outer_r = "70.6*cm">
-        <slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
-      </layer>
-      <layer id="3" inner_r = "71.5*cm" inner_z = "109.5*cm" outer_r = "95.6*cm">
-        <slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
-      </layer>
-      <layer id="4" inner_r = "96.5*cm" inner_z = "135.9*cm" outer_r = "120.6*cm">
-        <slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
-      </layer>
-      <layer id="5" inner_r = "121.5*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
-        <slice material = "CarbonFiber_15percent" 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 = "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 = "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 = "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 = "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 = "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>
-    </detector>
-
-    <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
-      <dimensions inner_r = "127.0*cm" outer_z = "182.0*cm" />
-      <layer repeat="1">
-        <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="20">
-        <slice material = "TungstenDens24" thickness = "0.25*cm" />
-        <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-        <slice material = "Copper"  thickness = "0.005*cm" />
-        <slice material = "Kapton"  thickness = "0.030*cm" />
-        <slice material = "Air"     thickness = "0.033*cm" />
-      </layer>
-      <layer repeat="10">
-        <slice material = "TungstenDens24" thickness = "0.5*cm" />
-        <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-        <slice material = "Copper"  thickness = "0.005*cm" />
-        <slice material = "Kapton"  thickness = "0.030*cm" />
-        <slice material = "Air"     thickness = "0.033*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="1">
-        <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="20">
-        <slice material = "TungstenDens24" thickness = "0.25*cm" />
-        <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-        <slice material = "Copper"  thickness = "0.005*cm" />
-        <slice material = "Kapton"  thickness = "0.030*cm" />
-        <slice material = "Air"     thickness = "0.033*cm" />
-      </layer>
-      <layer repeat="10">
-        <slice material = "TungstenDens24" thickness = "0.5*cm" />
-        <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-        <slice material = "Copper"  thickness = "0.005*cm" />
-        <slice material = "Kapton"  thickness = "0.030*cm" />
-        <slice material = "Air"     thickness = "0.033*cm" />
-      </layer>
-    </detector>
-
-    <detector id="3" 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>
-    </detector>
-
-    <detector id="7" 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>
-
-    <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>
-
-    <detector id="4" 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="8" 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>
-
-    <detector id="9" 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 = "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>
-
-    <detector id="0" name="ForwardEMMask" type="PolyconeSupport" insideTrackingVolume="false">
-      <material name="TungstenDens24"/>
-      <zplane rmin = "8.14*cm" rmax="8.69*cm" z="168.0*cm" />
-      <zplane rmin="8.68*cm" rmax="8.69*cm"  z="181.75*cm"/>
-    </detector>
-
-    <detector id="0" name="BackwardEMMask" type="PolyconeSupport" insideTrackingVolume="false">
-      <material name="TungstenDens24"/>
-      <zplane rmin="8.68*cm" rmax="8.69*cm"  z="-181.75*cm"/>
-      <zplane rmin = "8.14*cm" rmax="8.69*cm" z="-168.0*cm" />
-    </detector>
-
-    <detector id="0" name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="false">
-      <material name="TungstenDens24"/>
-      <zplane rmin = "8.68*cm" rmax="25.0*cm" z="182.0*cm" />
-      <zplane rmin="16.0*cm" rmax="25.0*cm"  z="330.0*cm"/>
-    </detector>
+        </layer>
+        </detector> 
 
-    <detector id="0" name="BackwardM1" type="PolyconeSupport" insideTrackingVolume="false">
-      <material name="TungstenDens24"/>
-      <zplane rmin="16.0*cm" rmax="25.0*cm"  z="-330.0*cm"/>
-      <zplane rmin = "8.68*cm" rmax="25.0*cm" z="-182.0*cm" />
-    </detector>
-
-    <detector id="0" name="ForwardLowZ" type="ForwardDetector" reflect="true" >
-      <dimensions outer_r="13.80*cm"
-                  inner_r="0.0*cm"
-                  inner_z="285.0*cm"
-                  />
-      <beampipe crossing_angle="0.014"
-                outgoing_r="1.2*cm"
-                incoming_r="1.0*cm"
-                />
-      <layer repeat="1">
-        <slice material = "Beryllium" thickness = "10.0*cm" sensitive = "no" />
-      </layer>
-    </detector>
-
-    <detector id="10" name="ForwardLuminosityMonitor" reflect="true" type="CylindricalEndcapCalorimeter" readout="LuminosityMonitorHits">
-      <dimensions inner_r = "2.0*cm" inner_z = "295.0*cm" outer_r = "14.28*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="0" name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false">
-      <material name="Vacuum"/>
-      <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> 
-    
-    <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)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
-    </detector>     
--->
+<detector id="0" name="TrackerSupportRings" type="DiskTracker" reflect="true">
+<layer id="1" inner_r = "21.5*cm" inner_z = "57.0*cm" outer_r = "45.6*cm">
+<slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
+</layer>
+<layer id="2" inner_r = "46.5*cm" inner_z = "83.6*cm" outer_r = "70.6*cm">
+<slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
+</layer>
+<layer id="3" inner_r = "71.5*cm" inner_z = "109.5*cm" outer_r = "95.6*cm">
+<slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
+</layer>
+<layer id="4" inner_r = "96.5*cm" inner_z = "135.9*cm" outer_r = "120.6*cm">
+<slice material = "CarbonFiber_15percent" thickness = "0.05*cm" />
+</layer>
+<layer id="5" inner_r = "121.5*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
+<slice material = "CarbonFiber_15percent" 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 = "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 = "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 = "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>
[truncated at 1000 lines; 228 more skipped]
CVSspam 0.2.8