Commit in LCDetectors/detectors/sidloi on MAIN
compact.xml+492-3601.1 -> 1.2
JM: add calorimeters; most tracker geometry is included but commented out for now

LCDetectors/detectors/sidloi
compact.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- compact.xml	16 Jan 2009 20:13:10 -0000	1.1
+++ compact.xml	30 Jan 2009 21:11:36 -0000	1.2
@@ -9,8 +9,14 @@
         <constant name="world_x" value="world_side"/>
         <constant name="world_y" value="world_side"/>
         <constant name="world_z" value="world_side"/>
-        <constant name="tracking_region_radius" value="1269.0"/>
-        <constant name="tracking_region_zmax" value="1679.0"/>
+        <constant name="EcalBarrel_rmin" value="1265.0"/>
+        <constant name="EcalEndcap_zmin" value="1657.0"/>
+<!--
+        <constant name="EcalBarrel_rmax" value="1396.0"/>
+        <constant name="HcalBarrel_rmax" value="2539.0"/>
+-->
+        <constant name="tracking_region_radius" value="EcalBarrel_rmin - 1.0"/>
+        <constant name="tracking_region_zmax" value="EcalEndcap_zmin - 1.0"/>
         <constant name="VXD_CF_sensor" value="0.026*cm"/>
         <constant name="VXD_CF_support" value="0.05*cm"/>
         <constant name="bp_cone_slope" value="(8.96-1.20)/(185-6.25)"/>
@@ -57,7 +63,7 @@
         </limitset>
     </limits>
     <detectors> 
-<!--      
+<!--
         <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="Beryllium"/>
             <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
@@ -139,66 +145,7 @@
             <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="10.0*cm"/>
             <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
         </detector>
--->
-        <detector id="1" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrelHits">
-            <module name="VtxBarrelModuleInner">
-                <module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
-                <module_component width="7.6" length="125.0" thickness="VXD_CF_sensor" material="CarbonFiber_25percent" sensitive="false">
-                    <position z="-0.12"/>
-                </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.093" material="Silicon" sensitive="true">
-                    <position z="0.150"/>
-                </module_component>
-                <module_component width="9.6" length="125.0" thickness="0.02" material="Silicon" sensitive="true">
-                    <position z="0.225"/>
-                </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="VXD_CF_sensor" material="CarbonFiber_25percent" sensitive="false">
-                    <position z="-0.12"/>
-                </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.093" material="Silicon" sensitive="true">
-                    <position z="0.150"/>
-                </module_component>
-                <module_component width="9.6" length="125.0" thickness="0.02" material="Silicon" sensitive="true">
-                    <position z="0.210"/>
-                </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="0" name="VertexBarrelSupports" type="MultiLayerTracker">
             <layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm">
                 <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
@@ -268,294 +215,27 @@
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
         </detector>
-        <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
-            <module name="SiVertexEndcapModule">
-                <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
-                <module_component thickness="0.005*cm" material="Epoxy" />
-                <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.1*cm" nwedges="12" module="SiVertexEndcapModule">
-                <module_parameters r_size="12.0" phi_size_max="12.0" />
+
+        <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
+            <layer id="1" inner_r="206.0" outer_z="577.328">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
             </layer>
-            <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.1*cm" nwedges="12" module="SiVertexEndcapModule">
-                <module_parameters r_size="12.0" phi_size_max="12.0" />
-            </layer>            
-            <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.1*cm" nwedges="12" module="SiVertexEndcapModule">
-                <module_parameters r_size="12.0" phi_size_max="12.0" />
+            <layer id="2" inner_r="456.0" outer_z="749.781">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
             </layer>
-            <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.1*cm" nwedges="12" module="SiVertexEndcapModule">
-                <module_parameters r_size="12.0" phi_size_max="12.0" />
+            <layer id="3" inner_r="706.0" outer_z="1013.802">
+                <slice material= "CarbonFiber" thickness = "0.05*cm" />
+                <slice material= "Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material= "CarbonFiber" thickness="0.05*cm" />
             </layer>
-        </detector>
- -->
-        <detector id="3" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrelHits">
-            <module name="SiTrackerModule_Layer0">                
-                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
-                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0038*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00038*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer1">                
-                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
-                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0051*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00052*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer2">                
-                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
-                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0064*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00065*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer3">                
-                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
-                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>               
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0078*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00079*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer4">                
-                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
-                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.0091*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79" length="97.79" thickness="0.00093*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <layer module="SiTrackerModule_Layer0" id="1">
-                <barrel_envelope inner_r="215.075" outer_r="245.0" z_length="578 * 2"/>
-                <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.128" nz="13"/>
-            </layer>                
-            <layer module="SiTrackerModule_Layer1" id="2">
-                <barrel_envelope inner_r="465.075" outer_r="501.0" z_length="749.8 * 2"/>
-                <rphi_layout phi_tilt="0.12217" nphi="38" phi0="0.087" rc="466.355 + 5.0" dr="0.0"/>
-                <z_layout dr="4.0" z0="690.605" nz="17"/>
-            </layer>
-            <layer module="SiTrackerModule_Layer2" id="3">
-                <barrel_envelope inner_r="715.075" outer_r="756.0" z_length="1013.9 * 2"/>
-                <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="954.625" nz="23"/>
-            </layer>            
-            <layer module="SiTrackerModule_Layer3" id="4">
-                <barrel_envelope inner_r="965.075" outer_r="1012.0" z_length="1272.3 * 2"/>
-                <rphi_layout phi_tilt="0.11502" nphi="80" phi0="0.0436" rc="966.355 + 5.0" dr="0.0"/>
-                <z_layout dr="4.0" z0="1213.073" nz="29"/>
-            </layer>                        
-            <layer module="SiTrackerModule_Layer4" id="5">
-                <barrel_envelope inner_r="1215.075" outer_r="1265.0" z_length="1535.7 * 2"/>
-                <rphi_layout phi_tilt="0.11467" nphi="102" phi0="0.01745" rc="1216.355 + 5.0" dr="0.0"/>
-                <z_layout dr="4.0" z0="1476.497" nz="35"/>
-            </layer>
-        </detector>
-        <detector id="4" name="SiTrackerEndcap" type="SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
-            <module name="Module1">
-                <trd x1="36.112" x2="46.635" z="100.114/2" />
-                <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="Module2">
-                <trd x1="45.245" x2="54.680" z="89.773/2" />
-                <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>
-            <layer id="1">
-                <ring r="256.716" zstart="787.105+1.75" nmodules="24" dz="1.75" module="Module1"/>
-                <ring r="353.991" zstart="778.776+1.75" nmodules="32" dz="1.75" module="Module1"/>
-                <ring r="449.180" zstart="770.544+1.75" nmodules="40" dz="1.75" module="Module1"/>
-            </layer>
-            <layer id="2">
-                <ring r="256.716" zstart="1073.293+1.75" nmodules="24" dz="1.75" module="Module1"/>
-                <ring r="353.991" zstart="1064.966+1.75" nmodules="32" dz="1.75" module="Module1"/>
-                <ring r="449.180" zstart="1056.734+1.75" nmodules="40" dz="1.75" module="Module1"/>
-                <ring r="538.520" zstart="1048.466+1.75" nmodules="40" dz="1.75" module="Module2"/>
-                <ring r="625.654" zstart="1041.067+1.75" nmodules="48" dz="1.75" module="Module2"/>
-                <ring r="703.666" zstart="1033.725+1.75" nmodules="54" dz="1.75" module="Module2" phi0="pi/54"/>
-            </layer>
-            <layer id="3">
-                <ring r="256.716" zstart="1353.786+1.75" nmodules="24" dz="1.75" module="Module1"/>
-                <ring r="353.991" zstart="1345.457+1.75" nmodules="32" dz="1.75" module="Module1"/>
-                <ring r="449.180" zstart="1337.225+1.75" nmodules="40" dz="1.75" module="Module1"/>
-                <ring r="538.520" zstart="1328.957+1.75" nmodules="40" dz="1.75" module="Module2"/>
-                <ring r="625.654" zstart="1321.558+1.75" nmodules="48" dz="1.75" module="Module2"/>
-                <ring r="703.666" zstart="1314.217+1.75" nmodules="54" dz="1.75" module="Module2" phi0="pi/54"/>
-                <ring r="793.448" zstart="1306.828+1.75" nmodules="58" dz="1.75" module="Module2" phi0="pi/58"/>
-                <ring r="874.239" zstart="1299.486+1.75" nmodules="64" dz="1.75" module="Module2"/>
-                <ring r="958.364" zstart="1292.189+1.75" nmodules="68" dz="1.75" module="Module2"/>
-            </layer>
-            <layer id="4">
-                <ring r="256.716" zstart="1639.164+1.75" nmodules="24" dz="1.75" module="Module1"/>
-                <ring r="353.991" zstart="1630.835+1.75" nmodules="32" dz="1.75" module="Module1"/>
-                <ring r="449.180" zstart="1622.603+1.75" nmodules="40" dz="1.75" module="Module1"/>
-                <ring r="538.520" zstart="1614.335+1.75" nmodules="40" dz="1.75" module="Module2"/>
-                <ring r="625.654" zstart="1606.936+1.75" nmodules="48" dz="1.75" module="Module2"/>
-                <ring r="703.666" zstart="1599.595+1.75" nmodules="54" dz="1.75" module="Module2" phi0="pi/54"/>
-                <ring r="793.448" zstart="1592.206+1.75" nmodules="58" dz="1.75" module="Module2" phi0="pi/58"/>
-                <ring r="874.239" zstart="1584.864+1.75" nmodules="64" dz="1.75" module="Module2"/>
-                <ring r="958.364" zstart="1577.567+1.75" nmodules="68" dz="1.75" module="Module2"/>
-                <ring r="1040.970" zstart="1570.222+1.75" nmodules="72" dz="1.75" module="Module2"/>
-                <ring r="1124.167" zstart="1562.916+1.75" nmodules="78" dz="1.75" module="Module2" phi0="pi/78"/>
-                <ring r="1206.937" zstart="1555.647+1.75" nmodules="84" dz="1.75" module="Module2"/>
-            </layer>
-        </detector>
-        <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
-            <layer id="1" inner_r="206.0" outer_z="577.328">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="2" inner_r="456.0" outer_z="749.781">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="3" inner_r="706.0" outer_z="1013.802">
-                <slice material= "CarbonFiber" thickness = "0.05*cm" />
-                <slice material= "Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material= "CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="4" inner_r="956.0" outer_z="1272.251">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
+            <layer id="4" inner_r="956.0" outer_z="1272.251">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
             </layer>
             <layer id="5" inner_r="1206.0" outer_z="1535.676">
                 <slice material="CarbonFiber" thickness="0.05*cm" />
@@ -564,7 +244,6 @@
             </layer>
         </detector>        
 
-        <!-- Layer 1 supports -->
         <detector id="0" name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="750.417-0.001" />
@@ -589,7 +268,6 @@
             <zplane rmin="206.234" rmax="206.234" z="784.336+0.001 " />
         </detector>
 
-        <!-- Layer 2 supports -->
         <detector id="0" name="SiTrackerEndcapSupport4" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="763.796" rmax="763.796" z="1014.437-0.001" />
@@ -614,7 +292,6 @@
             <zplane rmin="206.234" rmax="206.234" z="1070.522+0.001" />
         </detector>
 
-        <!-- Layer 3 supports -->
        <detector id="0" name="SiTrackerEndcapSupport7" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="1015.748" rmax="1015.748" z="1272.885-0.001" />
@@ -639,8 +316,6 @@
             <zplane rmin="206.234" rmax="206.234" z="1351.014+0.001" />
         </detector>
 
-        <!-- Layer 4 supports -->
-
         <detector id="0" name="SiTrackerEndcapSupport10" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="1263.808" rmax="1263.808" z="1536.560-0.001" />
@@ -665,7 +340,6 @@
             <zplane rmin="206.234" rmax="206.234" z="1636.392+0.001" />
         </detector>
 
-        <!-- Layer 1 supports -->
         <detector id="0" name="SiTrackerEndcapSupport1Reflect" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="-750.417+0.001" />
@@ -690,7 +364,6 @@
             <zplane rmin="206.234" rmax="206.234" z="-784.336-0.001 " />
         </detector>
 
-        <!-- Layer 2 supports -->
         <detector id="0" name="SiTrackerEndcapSupport4Reflect" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="763.796" rmax="763.796" z="-1014.437+0.001" />
@@ -715,7 +388,6 @@
             <zplane rmin="206.234" rmax="206.234" z="-1070.522-0.001" />
         </detector>
 
-        <!-- Layer 3 supports -->
        <detector id="0" name="SiTrackerEndcapSupport7Reflect" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="1015.748" rmax="1015.748" z="-1272.885+0.001" />
@@ -740,7 +412,6 @@
             <zplane rmin="206.234" rmax="206.234" z="-1351.014-0.001" />
         </detector>
 
-        <!-- Layer 4 supports -->
         <detector id="0" name="SiTrackerEndcapSupport10Reflect" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="CarbonFiber"/>
             <zplane rmin="1263.808" rmax="1263.808" z="-1536.560+0.001" />
@@ -764,7 +435,6 @@
             <zplane rmin="206.234" rmax="211.970" z="-1635.890-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1636.392-0.001" />
         </detector>
-
         <detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
             <layer id="1" inner_r="25.7*cm" inner_z="590.402" outer_r="45.6*cm">
                 <slice material="G10" thickness="0.057*cm" />
@@ -787,8 +457,339 @@
                 <slice material="Copper" thickness="0.0164*cm" />
             </layer>
         </detector>
+
+
+        <detector id="1" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrelHits">
+            <module name="VtxBarrelModuleInner">
+                <module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
+                <module_component width="7.6" length="125.0" thickness="VXD_CF_sensor" material="CarbonFiber_25percent" sensitive="false">
+                    <position z="-0.12"/>
+                </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.093" material="Silicon" sensitive="true">
+                    <position z="0.150"/>
+                </module_component>
+                <module_component width="9.6" length="125.0" thickness="0.02" material="Silicon" sensitive="true">
+                    <position z="0.225"/>
+                </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="VXD_CF_sensor" material="CarbonFiber_25percent" sensitive="false">
+                    <position z="-0.12"/>
+                </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.093" material="Silicon" sensitive="true">
+                    <position z="0.150"/>
+                </module_component>
+                <module_component width="9.6" length="125.0" thickness="0.02" material="Silicon" sensitive="true">
+                    <position z="0.210"/>
+                </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="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
+            <module name="SiVertexEndcapModule">
+                <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
+                <module_component thickness="0.005*cm" material="Epoxy" />
+                <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.1*cm" nwedges="12" module="SiVertexEndcapModule">
+                <module_parameters r_size="19.0" phi_size_max="8.0" />
+            </layer>
+
+            <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.1*cm" nwedges="12" module="SiVertexEndcapModule">
+                <module_parameters r_size="19.0" phi_size_max="9.0" />
+            </layer>            
+            <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.1*cm" nwedges="12" module="SiVertexEndcapModule">
+                <module_parameters r_size="19.0" phi_size_max="9.0" />
+            </layer>
+            <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.1*cm" nwedges="12" module="SiVertexEndcapModule">
+                <module_parameters r_size="19.0" phi_size_max="9.0" />
+            </layer>
+
+        </detector>
+
+        <detector id="3" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrelHits">
+            <module name="SiTrackerModule_Layer0">                
+                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
+                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
+                    <position z="-0.14*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="-0.122*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
+                    <position z="-0.024*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
+                    <position z="0.07475*cm" />
+                </module_component>
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="0.0915*cm" />
+                </module_component>                
+                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
+                    <position z="0.1145*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
+                    <position z="0.12974*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0038*cm" material="Kapton" sensitive="false">
+                    <position z="0.1375*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00038*cm" material="Copper" sensitive="false">
+                    <position z="0.146*cm"/>
+                </module_component>                
+            </module>
+            <module name="SiTrackerModule_Layer1">                
+                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
+                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
+                    <position z="-0.14*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="-0.122*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
+                    <position z="-0.024*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
+                    <position z="0.07475*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="0.0915*cm" />
+                </module_component>                
+                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
+                    <position z="0.1145*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
+                    <position z="0.12974*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0051*cm" material="Kapton" sensitive="false">
+                    <position z="0.1375*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00052*cm" material="Copper" sensitive="false">
+                    <position z="0.146*cm"/>
+                </module_component>                
+            </module>
+            <module name="SiTrackerModule_Layer2">                
+                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
+                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
+                    <position z="-0.14*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="-0.122*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
+                    <position z="-0.024*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
+                    <position z="0.07475*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="0.0915*cm" />
+                </module_component>                
+                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
+                    <position z="0.1145*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
+                    <position z="0.12974*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0064*cm" material="Kapton" sensitive="false">
+                    <position z="0.1375*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00065*cm" material="Copper" sensitive="false">
+                    <position z="0.146*cm"/>
+                </module_component>                
+            </module>
+            <module name="SiTrackerModule_Layer3">                
+                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
+                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
+                    <position z="-0.14*cm" />
+                </module_component>               
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="-0.122*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
+                    <position z="-0.024*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
+                    <position z="0.07475*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="0.0915*cm" />
+                </module_component>                
+                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
+                    <position z="0.1145*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
+                    <position z="0.12974*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0078*cm" material="Kapton" sensitive="false">
+                    <position z="0.1375*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00079*cm" material="Copper" sensitive="false">
+                    <position z="0.146*cm"/>
+                </module_component>                
+            </module>
+            <module name="SiTrackerModule_Layer4">                
+                <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
+                <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
+                    <position z="-0.14*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="-0.122*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
+                    <position z="-0.024*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0175*cm" material="Epoxy" sensitive="false">
+                    <position z="0.07475*cm" />
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
+                    <position z="0.0915*cm" />
+                </module_component>                
+                <module_component width="92.031" length="92.031" thickness="0.03*cm" material="Silicon" sensitive="true">
+                    <position z="0.1145*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00048*cm" material="Silicon" sensitive="false">
+                    <position z="0.12974*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.0091*cm" material="Kapton" sensitive="false">
+                    <position z="0.1375*cm"/>
+                </module_component>                
+                <module_component width="97.79" length="97.79" thickness="0.00093*cm" material="Copper" sensitive="false">
+                    <position z="0.146*cm"/>
+                </module_component>                
+            </module>
+            <layer module="SiTrackerModule_Layer0" id="1">
+                <barrel_envelope inner_r="215.075" outer_r="245.0" z_length="578 * 2"/>
+                <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.128" nz="13"/>
+            </layer>                
+            <layer module="SiTrackerModule_Layer1" id="2">
+                <barrel_envelope inner_r="465.075" outer_r="501.0" z_length="749.8 * 2"/>
+                <rphi_layout phi_tilt="0.12217" nphi="38" phi0="0.087" rc="466.355 + 5.0" dr="0.0"/>
+                <z_layout dr="4.0" z0="690.605" nz="17"/>
+            </layer>
+            <layer module="SiTrackerModule_Layer2" id="3">
+                <barrel_envelope inner_r="715.075" outer_r="756.0" z_length="1013.9 * 2"/>
+                <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="954.625" nz="23"/>
+            </layer>            
+            <layer module="SiTrackerModule_Layer3" id="4">
+                <barrel_envelope inner_r="965.075" outer_r="1012.0" z_length="1272.3 * 2"/>
+                <rphi_layout phi_tilt="0.11502" nphi="80" phi0="0.0436" rc="966.355 + 5.0" dr="0.0"/>
+                <z_layout dr="4.0" z0="1213.073" nz="29"/>
+            </layer>                        
+            <layer module="SiTrackerModule_Layer4" id="5">
+                <barrel_envelope inner_r="1215.075" outer_r="1265.0" z_length="1535.7 * 2"/>
+                <rphi_layout phi_tilt="0.11467" nphi="102" phi0="0.01745" rc="1216.355 + 5.0" dr="0.0"/>
+                <z_layout dr="4.0" z0="1476.497" nz="35"/>
+            </layer>
+        </detector>
+        <detector id="4" name="SiTrackerEndcap" type="SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
+            <module name="Module1">
+                <trd x1="36.112" x2="46.635" z="100.114/2" />
+                <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="Module2">
+                <trd x1="45.245" x2="54.680" z="89.773/2" />
+                <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>
+            <layer id="1">
+                <ring r="256.716" zstart="787.105+1.75" nmodules="24" dz="1.75" module="Module1"/>
+                <ring r="353.991" zstart="778.776+1.75" nmodules="32" dz="1.75" module="Module1"/>
+                <ring r="449.180" zstart="770.544+1.75" nmodules="40" dz="1.75" module="Module1"/>
+            </layer>
+            <layer id="2">
+                <ring r="256.716" zstart="1073.293+1.75" nmodules="24" dz="1.75" module="Module1"/>
+                <ring r="353.991" zstart="1064.966+1.75" nmodules="32" dz="1.75" module="Module1"/>
+                <ring r="449.180" zstart="1056.734+1.75" nmodules="40" dz="1.75" module="Module1"/>
+                <ring r="538.520" zstart="1048.466+1.75" nmodules="40" dz="1.75" module="Module2"/>
+                <ring r="625.654" zstart="1041.067+1.75" nmodules="48" dz="1.75" module="Module2"/>
+                <ring r="703.666" zstart="1033.725+1.75" nmodules="54" dz="1.75" module="Module2" phi0="pi/54"/>
+            </layer>
+            <layer id="3">
+                <ring r="256.716" zstart="1353.786+1.75" nmodules="24" dz="1.75" module="Module1"/>
+                <ring r="353.991" zstart="1345.457+1.75" nmodules="32" dz="1.75" module="Module1"/>
+                <ring r="449.180" zstart="1337.225+1.75" nmodules="40" dz="1.75" module="Module1"/>
+                <ring r="538.520" zstart="1328.957+1.75" nmodules="40" dz="1.75" module="Module2"/>
+                <ring r="625.654" zstart="1321.558+1.75" nmodules="48" dz="1.75" module="Module2"/>
+                <ring r="703.666" zstart="1314.217+1.75" nmodules="54" dz="1.75" module="Module2" phi0="pi/54"/>
+                <ring r="793.448" zstart="1306.828+1.75" nmodules="58" dz="1.75" module="Module2" phi0="pi/58"/>
+                <ring r="874.239" zstart="1299.486+1.75" nmodules="64" dz="1.75" module="Module2"/>
+                <ring r="958.364" zstart="1292.189+1.75" nmodules="68" dz="1.75" module="Module2"/>
+            </layer>
+            <layer id="4">
+                <ring r="256.716" zstart="1639.164+1.75" nmodules="24" dz="1.75" module="Module1"/>
+                <ring r="353.991" zstart="1630.835+1.75" nmodules="32" dz="1.75" module="Module1"/>
+                <ring r="449.180" zstart="1622.603+1.75" nmodules="40" dz="1.75" module="Module1"/>
+                <ring r="538.520" zstart="1614.335+1.75" nmodules="40" dz="1.75" module="Module2"/>
+                <ring r="625.654" zstart="1606.936+1.75" nmodules="48" dz="1.75" module="Module2"/>
+                <ring r="703.666" zstart="1599.595+1.75" nmodules="54" dz="1.75" module="Module2" phi0="pi/54"/>
+                <ring r="793.448" zstart="1592.206+1.75" nmodules="58" dz="1.75" module="Module2" phi0="pi/58"/>
+                <ring r="874.239" zstart="1584.864+1.75" nmodules="64" dz="1.75" module="Module2"/>
+                <ring r="958.364" zstart="1577.567+1.75" nmodules="68" dz="1.75" module="Module2"/>
+                <ring r="1040.970" zstart="1570.222+1.75" nmodules="72" dz="1.75" module="Module2"/>
+                <ring r="1124.167" zstart="1562.916+1.75" nmodules="78" dz="1.75" module="Module2" phi0="pi/78"/>
+                <ring r="1206.937" zstart="1555.647+1.75" nmodules="84" dz="1.75" module="Module2"/>
+            </layer>
+        </detector>
+-->
         <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits">
-            <dimensions numsides="12" rmin="1270.0" z="1820.0 * 2" />
+            <dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
             <layer repeat="1">
                 <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
                 <slice material = "Copper"  thickness = "0.005*cm" />
@@ -811,7 +812,7 @@
             </layer>
         </detector>
         <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter" reflect="true" readout="EcalEndcapHits">
-            <dimensions numsides="12" zmin="1680.0" rmin="260.0" rmax="1264.5" />
+            <dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="260.0" rmax="1264.5" />
             <layer repeat="1">
                 <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
                 <slice material = "Copper"  thickness = "0.005*cm" />
@@ -833,6 +834,117 @@
                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>
+
+        <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits">
+            <dimensions numsides="12" rmin="1419.0" z="3018.0 * 2"/>
+            <layer repeat="40">
+                <slice material = "Steel235" thickness = "1.89*cm" />
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" limits="cal_limits" />
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "G10" thickness = "0.3*cm" />        
+                <slice material = "Air" thickness = "0.16*cm" />
+            </layer>
+        </detector>
+
+        <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter" readout="HcalEndcapHits">
+            <dimensions numsides="12" zmin="1805.0" rmin="200.0" rmax="1250.0" />
+            <layer repeat="40">
+                <slice material = "Steel235" thickness = "1.89*cm" />
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" limits="cal_limits" />
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "G10" thickness = "0.3*cm" />        
+                <slice material = "Air" thickness = "0.16*cm" />
+            </layer>
+        </detector>
+
+        <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
+            <layer id="1" inner_r="2591.0" outer_z="2983.0">
+                <slice material="Steel235" thickness="801.0"/>
+            </layer>
+        </detector>
+
+        <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits">
+            <!-- TODO: Check the z value. -->
+            <dimensions numsides="8" rmin="3442.0" z="3018.0 * 2"/>
+            <layer repeat="11">
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" limits="cal_limits" />
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "G10" thickness = "0.3*cm" />        
+                <slice material = "Air" thickness = "0.16*cm" />
+                <slice material = "Steel235" thickness = "20.0*cm" />
+            </layer>
+        </detector>
+
+
+        <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter" readout="MuonEndcapHits" reflect="true">
+            <dimensions numsides="8" zmin="3028.0" rmin="200.0" rmax="6082.0" />
+            <layer repeat="11">
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "RPCGasDefault" thickness = "0.12*cm" sensitive = "yes" limits="cal_limits" />
+                <slice material = "PyrexGlass" thickness = "0.11*cm" />
+                <slice material = "G10" thickness = "0.3*cm" />        
+                <slice material = "Air" thickness = "0.16*cm" />
+                <slice material = "Steel235" thickness = "20.0*cm" />
+            </layer>
+        </detector>
+
+<!--
+        <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
+            <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ">
+                <slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
+                <slice material="Air" thickness="SolenoidBarrelInnerAirgapThickness" />
+            </layer>
+            <layer id="2" inner_r="SolenoidBarrelConductorInnerRadius" outer_z="262.5*cm">
+                <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness" />
+                <slice material="Steel235" thickness="SolenoidBarrelSteelThickness" />
+            </layer>
+            <layer id="3" inner_r="SolenoidBarrelOuterCryostatInnerRadius" outer_z="SolenoidBarrelOuterZ">
+                <slice material="Air" thickness="SolenoidBarrelOuterAirgapThickness" />
+                <slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness" />
+            </layer>
+        </detector>
+
+        <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
+            <layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius">
+                <slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
+            </layer>
+        </detector>
+
+    <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">
+      
+        <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>
+        
+        <layer id="1" inner_r="27.800" outer_r="166.9" inner_z="204.0" thickness="5.0" nwedges="36" module="SiTrackerForwardModule">
+            <module_parameters r_size="16.8" phi_size_max="20" />
+        </layer>
+        
+        <layer id="2" inner_r="75.1" outer_r="166.9" inner_z="538.5" thickness="5.0" nwedges="36" module="SiTrackerForwardModule">
+            <module_parameters r_size="16.8" phi_size_max="20" />
+        </layer>
+        
+        <layer id="3" inner_r="116.5" outer_r="166.9" inner_z="829.5" thickness="5.0" nwedges="36" module="SiTrackerForwardModule">
+            <module_parameters r_size="16.8" phi_size_max="20" />
+        </layer>        
+        
+    </detector>
+-->
+    
     </detectors>
     <readouts>
         <readout name="SiTrackerEndcapHits">
@@ -848,15 +960,35 @@
             <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:12</id>
         </readout>
         <readout name="EcalBarrelHits">
-            <segmentation type="GridXYZ" gridSizeX="1.0" gridSizeY="1.0" />
+            <segmentation type="GridXYZ" gridSizeX="3.5" gridSizeY="3.5" />
             <id>layer:8,system:6,barrel:3,module:4,slice:6,x:32:-15,y:-15</id>
         </readout>        
         <readout name="EcalEndcapHits">
+            <segmentation type="GridXYZ" gridSizeX="3.5" gridSizeZ="3.5" />
+            <id>layer:8,system:6,barrel:3,x:32:-16,z:-16</id>
+        </readout>
+        <readout name="HcalBarrelHits">
+            <segmentation type="GridXYZ" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />
+            <id>layer:8,system:6,barrel:3,x:32:-10,y:-10</id>
+        </readout>
+        <readout name="HcalEndcapHits">
             <segmentation type="GridXYZ" gridSizeX="1.0*cm" gridSizeZ="1.0*cm" />
             <id>layer:8,system:6,barrel:3,x:32:-16,z:-16</id>
         </readout>
+        <readout name="MuonBarrelHits">
+            <segmentation type="GridXYZ" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />
+            <id>layer:8,system:6,barrel:3,x:32:-10,y:-10</id>
+        </readout>
+        <readout name="MuonEndcapHits">
+            <segmentation type="GridXYZ" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />
+            <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id>
+        </readout>
+        <readout name="SiTrackerForwardHits">
+            <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:12</id>
+        </readout>
     </readouts>
     <fields>
+        <!-- TODO: Needs to be updated with current numbers. -->
         <field type="Solenoid" 
                name="GlobalSolenoid"
                inner_field="5.0"
CVSspam 0.2.8