Print

Print


Commit in LCDetectors/detectors/sidmay05_np on MAIN
compact.xml+579-3301.12 -> 1.13
Minor changes, to minimize diffs to sidmay05/compact.xml

LCDetectors/detectors/sidmay05_np
compact.xml 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- compact.xml	18 Jul 2005 19:17:42 -0000	1.12
+++ compact.xml	8 Aug 2005 18:42:02 -0000	1.13
@@ -1,3 +1,4 @@
+<!-- top-level compact description element -->
 <lccdd xmlns:lccdd="namespaceUrl"
        xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
        xs:noNamespaceSchemaLocation="noNamespaceUrl">
@@ -38,356 +39,604 @@
 
   <detectors>
 
- <!-- Beampipe -->
+    <!-- Beampipe -->
 
-       <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
-          <material name="Beryllium"/>
-          <zplane rmin = "tracking_region_zmax*17./351" rmax="(tracking_region_zmax*17./351+.1)" z="-tracking_region_zmax" />
-          <zplane rmin="1.2*cm" rmax="1.3*cm"  z="-6.251*cm"/>
-          <zplane  rmin="1.2*cm" rmax="1.225*cm" z="-6.25*cm"/>
-          <zplane rmin="1.2*cm" rmax="1.225*cm"  z="6.25*cm" />
-          <zplane  rmin="1.2*cm" rmax="1.3*cm" z="6.251*cm" />
-          <zplane rmin="tracking_region_zmax*17./351" rmax="(tracking_region_zmax*17./351+.1)" z="tracking_region_zmax"  />
-      </detector>
-
- <!-- BeamPipe Liner -->
-
-      <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
-          <material name="Titanium"/>
-          <zplane z="-6.25*cm" rmin="1.195*cm" rmax="1.20*cm" />
-          <zplane z="6.25*cm" rmin="1.195*cm" rmax="1.20*cm" />
-      </detector>
-
- <!-- Vertex Detector -->
-
-      <detector id="0" name="BarrelVertex" 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.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="3" inner_r = "3.7*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="1" name="EndcapVertex" type="DiskTracker" reflect="true" readout="VtxEndcapHits">
-        <layer id="1" inner_r = "1.4*cm" inner_z = "7.0*cm" outer_r = "7.0*cm">
-               <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-               <slice material = "Silicon" thickness = "0.028*cm" />
-        </layer>
-        <layer id="2" inner_r = "1.6*cm" inner_z = "9.5*cm" outer_r = "7.0*cm">
-               <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-               <slice material = "Silicon" thickness = "0.028*cm" />
-        </layer>
-         <layer id="3" inner_r = "1.8*cm" inner_z = "12.0*cm" outer_r = "7.0*cm">
-               <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-               <slice material = "Silicon" thickness = "0.028*cm" />
-        </layer>
-        <layer id="4" inner_r = "2.0*cm" inner_z = "17.0*cm" outer_r = "7.0*cm" >
-               <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-               <slice material = "Silicon" thickness = "0.028*cm" />
-        </layer>
-     </detector>
-
-<!-- Vertex supports and cryostat -->
-
-      <detector id="0" name="BarrelVertexSupports" 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 = "23.0*cm">
-                <slice material = "PolystyreneFoam" thickness = "1.5*cm"/>
-          </layer>
-      </detector>
-
-     <detector id="1" name="BarrelVertexEndSupports" type="DiskTracker" reflect="true">
-        <layer id="1" inner_r = "1.5*cm" inner_z = "6.5*cm" outer_r = "7.0*cm">
-           <slice material = "Beryllium" thickness = "0.5*cm" />
-        </layer>
-        <layer id="2" inner_r = "2.3*cm" inner_z = "20.0*cm" outer_r = "11.2*cm">
-           <slice material = "PolystyreneFoam" thickness = "3.0*cm" />
-        </layer>
-     </detector>
-
-<!-- Tracker -->
-
-     <detector id="2" name="BarrelTracker" type="MultiLayerTracker"  readout="TkrBarrHits">
-          <layer id="1" inner_r = "18.635*cm" outer_z = "26.67*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness=".025*cm" />
-                <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-          </layer>
-          <layer id="2" inner_r = "44.885*cm" outer_z = "61.67*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness=".025*cm" />
-                <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-          </layer>
-          <layer id="3" inner_r = "71.135*cm" outer_z = "96.67*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness=".025*cm" />
-                <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-          </layer>
-          <layer id="4" inner_r = "97.385*cm" outer_z = "131.67*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness=".025*cm" />
-                <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-          </layer>
-          <layer id="5" inner_r = "123.635*cm" outer_z = "164.9*cm">
-                <slice material = "CarbonFiber" thickness = "0.025*cm" />
-                <slice material = "Rohacell31" thickness="1.3*cm" />
-                <slice material = "CarbonFiber" thickness=".025*cm" />
-                <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-          </layer>
-     </detector>
-
-     <detector id="3" name="EndcapTracker" type="DiskTracker" reflect="true" readout="TkrEndcapHits">
-        <layer id="1" inner_r = "4.0*cm" inner_z = "27.1*cm" outer_r = "20.50*cm">
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="2" inner_r = "4.0*cm" inner_z = "27.13*cm" outer_r = "20.50*cm">
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="3" inner_r = "7.9*cm" inner_z = "62.1*cm" outer_r = "46.75*cm">
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="4" inner_r = "7.9*cm" inner_z = "62.13*cm" outer_r = "46.75*cm" >
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="5" inner_r = "11.7*cm" inner_z = "97.1*cm" outer_r = "73.0*cm" >
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="6" inner_r = "11.7*cm" inner_z = "97.13*cm" outer_r = "73.0*cm">
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="7" inner_r = "15.6*cm" inner_z = "132.1*cm" outer_r = "99.25*cm">
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="8" inner_r = "15.6*cm" inner_z = "132.13*cm" outer_r = "99.25*cm">
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="9" inner_r = "19.5*cm" inner_z = "164.94*cm" outer_r = "125.50*cm" >
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-        <layer id="10" inner_r = "19.5*cm" inner_z = "164.97*cm" outer_r = "125.50*cm" >
-           <slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
-        </layer>
-     </detector>
-
-<!-- supports for endcap tracker -->
-     <detector id="4" name="EndcapTrackerSupports" type="DiskTracker" reflect="true">
-        <layer id="1" inner_r = "4.0*cm" inner_z = "27.16*cm" outer_r = "20.50*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.16*cm" outer_r = "46.75*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.7*cm" inner_z = "97.16*cm" outer_r = "73.0*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.16*cm" outer_r = "99.25*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 = "19.5*cm" inner_z = "165.0*cm" outer_r = "125.5*cm">
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-           <slice material = "Rohacell31" thickness = "2.5*cm" />
-           <slice material = "CarbonFiber" thickness = "0.039*cm" />
-        </layer>
+    <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
+      <material name="Beryllium"/>
+      <zplane rmin = "tracking_region_zmax*17./351" rmax="(tracking_region_zmax*17./351+.1)" z="-tracking_region_zmax" />
+      <zplane rmin="1.2*cm" rmax="1.3*cm"  z="-6.251*cm"/>
+      <zplane  rmin="1.2*cm" rmax="1.225*cm" z="-6.25*cm"/>
+      <zplane rmin="1.2*cm" rmax="1.225*cm"  z="6.25*cm" />
+      <zplane  rmin="1.2*cm" rmax="1.3*cm" z="6.251*cm" />
+      <zplane rmin="tracking_region_zmax*17./351" rmax="(tracking_region_zmax*17./351+.1)" z="tracking_region_zmax"  />
     </detector>
 
-<!-- Electromagnetic calorimeter -->
+    <!-- BeamPipe Liner -->
+
+    <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
+      <material name="Titanium"/>
+      <zplane z="-6.25*cm" rmin="1.195*cm" rmax="1.20*cm" />
+      <zplane z="6.25*cm" rmin="1.195*cm" rmax="1.20*cm" />
+    </detector>
+
+    <!-- Vertex Detector -->
+
+    <detector id="0" name="BarrelVertex" 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.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="3" inner_r = "3.7*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="1" name="EndcapVertex" type="DiskTracker" reflect="true" readout="VtxEndcapHits">
+      <layer id="1" inner_r = "1.4*cm" inner_z = "7.0*cm" outer_r = "7.0*cm">
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.028*cm" />
+      </layer>
+      <layer id="2" inner_r = "1.6*cm" inner_z = "9.5*cm" outer_r = "7.0*cm">
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.028*cm" />
+      </layer>
+      <layer id="3" inner_r = "1.8*cm" inner_z = "12.0*cm" outer_r = "7.0*cm">
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.028*cm" />
+      </layer>
+      <layer id="4" inner_r = "2.0*cm" inner_z = "17.0*cm" outer_r = "7.0*cm" >
+	<slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
+	<slice material = "Silicon" thickness = "0.028*cm" />
+      </layer>
+    </detector>
+
+    <!-- Vertex supports and cryostat -->
+
+    <detector id="0" name="BarrelVertexSupports" 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 = "23.0*cm">
+	<slice material = "PolystyreneFoam" thickness = "1.5*cm"/>
+      </layer>
+    </detector>
+
+    <detector id="1" name="BarrelVertexEndSupports" type="DiskTracker" reflect="true">
+      <layer id="1" inner_r = "1.5*cm" inner_z = "6.5*cm" outer_r = "7.0*cm">
+	<slice material = "Beryllium" thickness = "0.5*cm" />
+      </layer>
+      <layer id="2" inner_r = "2.3*cm" inner_z = "20.0*cm" outer_r = "11.2*cm">
+	<slice material = "PolystyreneFoam" thickness = "3.0*cm" />
+      </layer>
+    </detector>
+
+    <!-- Tracker -->
+
+    <detector id="2" name="BarrelTracker" type="MultiLayerTracker"  readout="TkrBarrHits">
+      <layer id="1" inner_r = "18.635*cm" outer_z = "26.67*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness=".025*cm" />
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="2" inner_r = "44.885*cm" outer_z = "61.67*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness=".025*cm" />
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="3" inner_r = "71.135*cm" outer_z = "96.67*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness=".025*cm" />
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="4" inner_r = "97.385*cm" outer_z = "131.67*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness=".025*cm" />
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="5" inner_r = "123.635*cm" outer_z = "164.9*cm">
+	<slice material = "CarbonFiber" thickness = "0.025*cm" />
+	<slice material = "Rohacell31" thickness="1.3*cm" />
+	<slice material = "CarbonFiber" thickness=".025*cm" />
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+    </detector>
+
+    <detector id="3" name="EndcapTracker" type="DiskTracker" reflect="true" readout="TkrEndcapHits">
+      <layer id="1" inner_r = "4.0*cm" inner_z = "27.1*cm" outer_r = "20.50*cm">
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="2" inner_r = "4.0*cm" inner_z = "27.13*cm" outer_r = "20.50*cm">
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="3" inner_r = "7.9*cm" inner_z = "62.1*cm" outer_r = "46.75*cm">
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="4" inner_r = "7.9*cm" inner_z = "62.13*cm" outer_r = "46.75*cm" >
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="5" inner_r = "11.7*cm" inner_z = "97.1*cm" outer_r = "73.0*cm" >
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="6" inner_r = "11.7*cm" inner_z = "97.13*cm" outer_r = "73.0*cm">
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="7" inner_r = "15.6*cm" inner_z = "132.1*cm" outer_r = "99.25*cm">
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="8" inner_r = "15.6*cm" inner_z = "132.13*cm" outer_r = "99.25*cm">
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="9" inner_r = "19.5*cm" inner_z = "164.94*cm" outer_r = "125.50*cm" >
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+      <layer id="10" inner_r = "19.5*cm" inner_z = "164.97*cm" outer_r = "125.50*cm" >
+	<slice material = "Silicon" thickness = "0.03*cm" sensitive = "yes" />
+      </layer>
+    </detector>
+
+    <!-- supports for endcap tracker -->
+    <detector id="4" name="EndcapTrackerSupports" type="DiskTracker" reflect="true">
+      <layer id="1" inner_r = "4.0*cm" inner_z = "27.16*cm" outer_r = "20.50*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.16*cm" outer_r = "46.75*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.7*cm" inner_z = "97.16*cm" outer_r = "73.0*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.16*cm" outer_r = "99.25*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 = "19.5*cm" inner_z = "165.0*cm" outer_r = "125.5*cm">
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+	<slice material = "Rohacell31" thickness = "2.5*cm" />
+	<slice material = "CarbonFiber" thickness = "0.039*cm" />
+      </layer>
+    </detector>
+
+    <!-- Tim Nelson's version of tracker follows -->
+    <!-- Barrel Tracker Supports -->
+    <!--
+	<detector id="2" name="BarrelTrackerSupports" type="MultiLayerTracker">
+	<layer id="1" inner_r = "18.000*cm" outer_z = "26.7*cm">
+	<slice material = "CarbonFiber" width = "0.025*cm" />
+	<slice material = "Rohacell31" width="1.3*cm" />
+	<slice material = "CarbonFiber" width="0.025*cm" />
+	</layer>
+	<layer id="2" inner_r = "44.300*cm" outer_z = "61.7*cm">
+	<slice material = "CarbonFiber" width = "0.025*cm" />
+	<slice material = "Rohacell31" width="1.3*cm" />
+	<slice material = "CarbonFiber" width="0.025*cm" />
+	</layer>
+	<layer id="3" inner_r = "70.500*cm" outer_z = "96.7*cm">
+	<slice material = "CarbonFiber" width = "0.025*cm" />
+	<slice material = "Rohacell31" width="1.3*cm" />
+	<slice material = "CarbonFiber" width="0.025*cm" />
+	</layer>
+	<layer id="4" inner_r = "96.800*cm" outer_z = "131.7*cm">
+	<slice material = "CarbonFiber" width = "0.025*cm" />
+	<slice material = "Rohacell31" width="1.3*cm" />
+	<slice material = "CarbonFiber" width="0.025*cm" />
+	</layer>
+	<layer id="5" inner_r = "119.300*cm" outer_z = "161.7*cm">
+	<slice material = "CarbonFiber" width = "0.025*cm" />
+	<slice material = "Rohacell31" width="1.3*cm" />
+	<slice material = "CarbonFiber" width="0.025*cm" />
+	</layer>
+	</detector>
+    -->
+
+    <!-- Barrel Tracker Modules -->
+    <!--
+	<detector id="2" name="BarrelTracker" type="MultiLayerTracker"  readout="TkrBarrHits">
+	<layer id="1" inner_r = "20.000*cm" outer_z = "26.7*cm">
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0038*cm" />
+	<slice material = "Copper" width = "0.00038*cm" />
+	</layer>
+	<layer id="2" inner_r = "46.300*cm" outer_z = "61.7*cm">
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0051*cm" />
+	<slice material = "Copper" width = "0.00052*cm" />
+	</layer>
+	<layer id="3" inner_r = "72.500*cm" outer_z = "96.7*cm">
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0064*cm" />
+	<slice material = "Copper" width = "0.00065*cm" />
+	</layer>
+	<layer id="4" inner_r = "98.800*cm" outer_z = "131.7*cm">
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0078*cm" />
+	<slice material = "Copper" width = "0.00079*cm" />
+	</layer>
+	<layer id="5" inner_r = "121.300*cm" outer_z = "161.7*cm">
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0091*cm" />
+	<slice material = "Copper" width = "0.00093*cm" />
+	</layer>
+	</detector>
+    -->
+    <!-- Endcap Tracker Supports -->
+    <!--
+	<detector id="4" name="EndcapTrackerSupports" 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" width = "0.039*cm" />
+	<slice material = "Rohacell31" width = "2.5*cm" />
+	<slice material = "CarbonFiber" width = "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" width = "0.039*cm" />
+	<slice material = "Rohacell31" width = "2.5*cm" />
+	<slice material = "CarbonFiber" width = "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" width = "0.039*cm" />
+	<slice material = "Rohacell31" width = "2.5*cm" />
+	<slice material = "CarbonFiber" width = "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" width = "0.039*cm" />
+	<slice material = "Rohacell31" width = "2.5*cm" />
+	<slice material = "CarbonFiber" width = "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" width = "0.039*cm" />
+	<slice material = "Rohacell31" width = "2.5*cm" />
+	<slice material = "CarbonFiber" width = "0.039*cm" />
+	</layer>
+	</detector>
+    -->
+    <!-- Endcap Tracker Modules -->
+    <!--
+	<detector id="3" name="EndcapTracker" 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" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0038*cm" />
+	<slice material = "Copper" width = "0.00038*cm" />
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	</layer>
+	<layer id="2" inner_r = "4.0*cm" inner_z = "30.4*cm" outer_r = "25.000*cm">
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0038*cm" />
+	<slice material = "Copper" width = "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" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0051*cm" />
+	<slice material = "Copper" width = "0.00052*cm" />
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	</layer>
+	<layer id="4" inner_r = "7.9*cm" inner_z = "65.4*cm" outer_r = "51.300*cm" >
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0051*cm" />
+	<slice material = "Copper" width = "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" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0064*cm" />
+	<slice material = "Copper" width = "0.00065*cm" />
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	</layer>
+	<layer id="6" inner_r = "11.8*cm" inner_z = "100.4*cm" outer_r = "77.500*cm">
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0064*cm" />
+	<slice material = "Copper" width = "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" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0078*cm" />
+	<slice material = "Copper" width = "0.00079*cm" />
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	</layer>
+	<layer id="8" inner_r = "15.6*cm" inner_z = "135.4*cm" outer_r = "103.800*cm">
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0078*cm" />
+	<slice material = "Copper" width = "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" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0091*cm" />
+	<slice material = "Copper" width = "0.00093*cm" />
+	<slice material = "PEEK" width = "0.02*cm" />
+	<slice material = "Rohacell31" width="0.14*cm" />
+	<slice material = "Epoxy" width="0.0175*cm" />
+	<slice material = "CarbonFiber" width=".016*cm" />
+	</layer>
+	<layer id="10" inner_r = "18.9*cm" inner_z = "165.4*cm" outer_r = "126.300*cm" >
+	<slice material = "Silicon" width = "0.03*cm" sensitive = "yes" />
+	<slice material = "Silicon" width = "0.00048*cm" />
+	<slice material = "Kapton" width = "0.0091*cm" />
+	<slice material = "Copper" width = "0.00093*cm" />
+	</layer>
+	</detector>
+    -->
+    <!-- Tracker Support Rings -->
+    <!--
+	<detector id="2" 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" width = "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" width = "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" width = "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" width = "0.15*cm" />
+	</layer>
+	<layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "127.0*cm">
+	<slice material = "CarbonFiber" width = "0.15*cm" />
+	</layer>
+	</detector>
+    -->
+    <!-- Tracker Readout/Power Distribution System -->
+    <!--
+	<detector id="2" 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" width = "0.057*cm" />
+	<slice material = "Copper" width = "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" width = "0.102*cm" />
+	<slice material = "Copper" width = "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" width = "0.108*cm" />
+	<slice material = "Copper" width = "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" width = "0.186*cm" />
+	<slice material = "Copper" width = "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" width = "0.246*cm" />
+	<slice material = "Copper" width = "0.0164*cm" />
+	</layer>
+	</detector>
+    -->
+
+    <!-- Electromagnetic calorimeter -->
 
     <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
-         <dimensions inner_r = "127.0*cm" outer_z = "179.5*cm" />
-         <layer repeat="30">
-           <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>
+      <dimensions inner_r = "127.0*cm" outer_z = "179.5*cm" />
+      <layer repeat="30">
+	<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>
     </detector>
 
     <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
-        <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
-        <layer repeat="30" >
-          <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>
+      <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
+      <layer repeat="30" >
+	<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>
     </detector>
 
-<!-- Hadronic calorimeter -->
+    <!-- Hadronic calorimeter -->
 
     <detector id="3" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">
-         <dimensions inner_r = "138.5*cm" outer_z = "277.0*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 = "138.5*cm" outer_z = "277.0*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 = "20.0*cm" inner_z = "179.5*cm" outer_r = "138.25*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="2" 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="4" 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="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 = "20.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 -->
-<detector id="9" name="ForwardMask" type="PolyconeSupport" insideTrackingVolume="false">>
-      <material name="Tungsten"/>
-      <zplane rmin = "8.0*cm" rmax="19.0*cm" z="200.0*cm" />
-      <zplane rmin="15.0*cm" rmax="19.0*cm"  z="315.0*cm"/>
-</detector>
-
-<detector id="9" name="BackwardMask" type="PolyconeSupport" insideTrackingVolume="false">>
-      <material name="Tungsten"/>
-      <zplane rmin="15.0*cm" rmax="19.0*cm"  z="-315.0*cm"/>
-      <zplane rmin = "8.0*cm" rmax="19.0*cm" z="-200.0*cm" />
-</detector>
-
-
-
-<!-- Luminosity monitor -->
-<!--
-    <detector id="9" name="LUMEndcap" reflect="true" type="CylindricalEndcapCalorimeter">
-        <dimensions inner_r = "0.0001*cm" inner_z = "310.0*cm" outer_r = "9.2*cm" />
-        <layer repeat="1">
-          <slice material="Beryllium" thickness = "10.*cm" />
-          <slice material="Tungsten" thickness = "35.*cm" sensitive = "yes" />
-        </layer>
+      <dimensions inner_r = "20.0*cm" inner_z = "179.5*cm" outer_r = "138.25*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="2" 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="4" 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="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 = "20.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 -->
+    <detector id="9" name="ForwardMask" type="PolyconeSupport" insideTrackingVolume="false">>
+    <material name="Tungsten"/>
+    <zplane rmin = "8.0*cm" rmax="19.0*cm" z="200.0*cm" />
+    <zplane rmin="15.0*cm" rmax="19.0*cm"  z="315.0*cm"/>
+    </detector>
+
+    <detector id="9" name="BackwardMask" type="PolyconeSupport" insideTrackingVolume="false">>
+    <material name="Tungsten"/>
+    <zplane rmin="15.0*cm" rmax="19.0*cm"  z="-315.0*cm"/>
+    <zplane rmin = "8.0*cm" rmax="19.0*cm" z="-200.0*cm" />
+    </detector>
+
+
+
+    <!-- Luminosity monitor -->
+    <!--
+	<detector id="9" name="LUMEndcap" reflect="true" type="CylindricalEndcapCalorimeter">
+	<dimensions inner_r = "0.0001*cm" inner_z = "310.0*cm" outer_r = "9.2*cm" />
+	<layer repeat="1">
+	<slice material="Beryllium" thickness = "10.*cm" />
+	<slice material="Tungsten" thickness = "35.*cm" sensitive = "yes" />
+	</layer>
+	</detector>
+    -->
 
 
   </detectors>
 
-<!-- Sensitive Detector readout segmentation -->
+  <!-- Sensitive Detector readout segmentation -->
   <readouts>
-         <readout name="MuonBarrHits">
-             <segmentation type="NonprojectiveCylinder" gridSizePhi="30.0" gridSizeZ="30.0" />
-             <id>layer:16,system:6,barrel:3,phi:32:16,z:-16</id>
-         </readout>
-         <readout name="HcalBarrHits">
-             <segmentation type="NonprojectiveCylinder" gridSizePhi="10.0" gridSizeZ="10.0" />
-             <id>layer:16,system:6,barrel:3,phi:32:16,z:-16</id>
-         </readout>
-         <readout name="EcalBarrHits">
-             <segmentation type="NonprojectiveCylinder" gridSizePhi="4.0" gridSizeZ="4.0" />
-             <id>layer:16,system:6,barrel:3,phi:32:16,z:-16</id>
-         </readout>
-         <readout name="MuonEndcapHits">
-             <segmentation type="GridXYZ" gridSizeX="30.0" gridSizeY="30.0" />
-             <id>layer:16,system:6,barrel:3,x:32:-16,y:-16</id>
-         </readout>
-         <readout name="HcalEndcapHits">
-             <segmentation type="GridXYZ" gridSizeX="10.0" gridSizeY="10.0" />
-             <id>layer:16,system:6,barrel:3,x:32:-16,y:-16</id>
-         </readout>
-         <readout name="EcalEndcapHits">
-           <segmentation type="GridXYZ" gridSizeX="4.0" gridSizeY="4.0" />
-           <id>layer:16,system:6,barrel:3,x:32:-16,y:-16</id>
-        </readout>
-
-         <readout name="TkrBarrHits">
-             <id>layer:10,system:6,barrel:3</id>
-         </readout>
-         <readout name="TkrEndcapHits">
-             <id>layer:10,system:6,barrel:3</id>
-         </readout>
-         <readout name="VtxBarrHits">
-             <id>layer:10,system:6,barrel:3</id>
-         </readout>
-         <readout name="VtxEndcapHits">
-             <id>layer:10,system:6,barrel:3</id>
-         </readout>
-   </readouts>
-    <fields>
+    <readout name="MuonBarrHits">
+      <segmentation type="NonprojectiveCylinder" gridSizePhi="30.0" gridSizeZ="30.0" />
+      <id>layer:16,system:6,barrel:3,phi:32:16,z:-16</id>
+    </readout>
+    <readout name="MuonEndcapHits">
+      <segmentation type="GridXYZ" gridSizeX="30.0" gridSizeY="30.0" />
+      <id>layer:16,system:6,barrel:3,x:32:-16,y:-16</id>
+    </readout>
+    <readout name="HcalBarrHits">
+      <segmentation type="NonprojectiveCylinder" gridSizePhi="10.0" gridSizeZ="10.0" />
+      <id>layer:16,system:6,barrel:3,phi:32:16,z:-16</id>
+    </readout>
+    <readout name="HcalEndcapHits">
+      <segmentation type="GridXYZ" gridSizeX="10.0" gridSizeY="10.0" />
+      <id>layer:16,system:6,barrel:3,x:32:-16,y:-16</id>
+    </readout>
+    <readout name="EcalBarrHits">
+      <segmentation type="NonprojectiveCylinder" gridSizePhi="4.0" gridSizeZ="4.0" />
+      <id>layer:16,system:6,barrel:3,phi:32:16,z:-16</id>
+    </readout>
+    <readout name="EcalEndcapHits">
+      <segmentation type="GridXYZ" gridSizeX="4.0" gridSizeY="4.0" />
+      <id>layer:16,system:6,barrel:3,x:32:-16,y:-16</id>
+    </readout>
+
+    <readout name="TkrBarrHits">
+      <id>layer:10,system:6,barrel:3</id>
+    </readout>
+    <readout name="TkrEndcapHits">
+      <id>layer:10,system:6,barrel:3</id>
+    </readout>
+    <readout name="VtxBarrHits">
+      <id>layer:10,system:6,barrel:3</id>
+    </readout>
+    <readout name="VtxEndcapHits">
+      <id>layer:10,system:6,barrel:3</id>
+    </readout>
+  </readouts>
+  <fields>
     <field type="Solenoid" name="GlobalSolenoid"
-              inner_field="5.0"
-              outer_field="-0.6"
-              zmax="1000"
-              outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Air gap + half coil-->
-   </fields>
+	   inner_field="5.0"
+	   outer_field="-0.6"
+	   zmax="1000"
+	   outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Air gap + half coil-->
+  </fields>
 </lccdd>
CVSspam 0.2.8