Commit in LCDetectors/detectors/sidloi on MAIN
compact.xml+188-2901.14 -> 1.15
JM: checkpoint; everything included from sid02; supports not visualized for now

LCDetectors/detectors/sidloi
compact.xml 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- compact.xml	20 Feb 2009 08:34:40 -0000	1.14
+++ compact.xml	22 Feb 2009 00:17:40 -0000	1.15
@@ -6,7 +6,7 @@
         author="Norman Graf, Jeremy McCormick"
         url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
         status="development"
-        version="$Id: compact.xml,v 1.14 2009/02/20 08:34:40 jeremy Exp $">
+        version="$Id: compact.xml,v 1.15 2009/02/22 00:17:40 jeremy Exp $">
         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>
@@ -104,7 +104,7 @@
         <vis name="SiTrackerBarrelModuleVis" alpha="1.0" r="0.8" g="1.0" b="0.1" 
             drawingStyle="wireframe" showDaughters="false" visible="true"/>
         <vis name="SiTrackerBarrelLayerVis" showDaughters="true" visible="false"/>
-        <vis name="SiTrackerEndcapModuleVis" alpha="0.01" r="0.8" g="1.0" b="0.1" 
+        <vis name="SiTrackerEndcapModuleVis" alpha="0.1" r="0.8" g="1.0" b="0.1" 
             drawingStyle="solid" showDaughters="false" visible="true"/>
         
         <vis name="EcalBarrelVis" showDaughters="true" visible="false"/>
@@ -115,10 +115,13 @@
         <vis name="HcalBarrelStavesVis" r="0.296875" g="0.48828125" b="0.4921875" showDaughters="false" visible="true"/>
         <vis name="HcalEndcapVis" r="0.296875" g="0.48828125" b="0.4921875" showDaughters="false" visible="true"/>
         
+        <vis name="SolenoidBarrelLayerVis" r="0.20703125" g="0.453125" b="0.77734375" showDaughters="false" visible="true"/>
+        
         <vis name="MuonBarrelVis" showDaughters="true" visible="false"/>
         <vis name="MuonBarrelStavesVis" r="0.28125" g="0.390625" b="0.625" showDaughters="false" visible="true"/>
         <vis name="MuonEndcapVis" r="0.28125" g="0.390625" b="0.625" showDaughters="false" visible="true"/>
         
+        <vis name="BeampipeVis" r="0.7734375" g="0.8671875" b="0.99609375" showDaughters="false" visible="true"/>
     </display>
     <detectors>
         <detector id="1" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
@@ -445,6 +448,51 @@
                 <ring r="1206.937" zstart="1555.647+1.75" nmodules="84" dz="1.75" module="Module2"/>
             </layer>
         </detector>
+        <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">    
+            <module name="SiTrackerForwardModule">
+                <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="22.7" outer_r="166.7" inner_z="206.225" thickness="1.0" nwedges="12" module="SiTrackerForwardModule">
+                <module_parameters r_size="18.0" phi_size_max="5" />
+            </layer>
+            <layer id="2" inner_r="76.7" outer_r="166.7" inner_z="540.677" thickness="1.0" nwedges="12" module="SiTrackerForwardModule">
+                <module_parameters r_size="18.0" phi_size_max="5" />
+            </layer>    
+            <layer id="3" inner_r="112.7" outer_r="166.7" inner_z="831.761" thickness="1.0" nwedges="12" module="SiTrackerForwardModule">
+                <module_parameters r_size="18.0" phi_size_max="5" />
+            </layer>        
+        </detector>
+        <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits">
+            <dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
+            <beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
+            <layer repeat="50">
+                <slice material="TungstenDens24" thickness="0.271*cm" />
+                <slice material="Silicon" thickness="0.032*cm" sensitive="yes" />
+                <slice material="Copper" thickness="0.005*cm" />
+                <slice material="Kapton" thickness="0.030*cm" />
+                <slice material="Air" thickness="0.033*cm" />
+            </layer>
+        </detector>
+        <detector id="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits">
+            <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
+            <layer repeat="20" >
+                <slice material = "TungstenDens24" thickness = "0.271*cm" />
+                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+                <slice material = "Copper"  thickness = "0.005*cm" />
+                <slice material = "Kapton"  thickness = "0.030*cm" />
+                <slice material = "Air"     thickness = "0.033*cm" />
+            </layer>
+            <layer repeat="10" >
+                <slice material = "TungstenDens24" thickness = "0.543*cm" />
+                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
+                <slice material = "Copper"  thickness = "0.005*cm" />
+                <slice material = "Kapton"  thickness = "0.030*cm" />
+                <slice material = "Air"     thickness = "0.033*cm" />
+            </layer>
+        </detector>
         <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis">
             <dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
             <staves vis="EcalBarrelStaveVis"/>
@@ -559,8 +607,9 @@
             </layer>
         </detector>
         
-    <!--  
-        <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
+        <!-- /\/\/\ START DEAD MATERIAL AND SUPPORTS. /\/\/\ -->
+        
+        <detector id="0" name="Beampipe" type="PolyconeSupport" insideTrackingVolume="true" vis="BeampipeVis">
             <material name="Beryllium"/>
             <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
             rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="-37.5*cm" />
@@ -571,25 +620,56 @@
             <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
             rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="37.5*cm" />
         </detector>
-        <detector id="0" name="SteelConeZbackward" type="PolyconeSupport" insideTrackingVolume="true">
-            <material name="Iron"/>
-            <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" 
-            rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.3992*cm)" 
-            z="-tracking_region_zmax" />
-            <zplane rmin = "((37.51-6.25)*bp_cone_slope+1.2)*cm" 
-            rmax = "((37.51-6.25)*bp_cone_slope+1.2875)*cm" 
-            z="-37.51*cm" />
-        </detector>
-        <detector id="0" name="SteelConeZforward" type="PolyconeSupport" insideTrackingVolume="true">
-            <material name="Iron"/>            
-            <zplane rmin = "((37.51-6.25)*bp_cone_slope+1.2)*cm" 
-            rmax = "((37.51-6.25)*bp_cone_slope+1.2875)*cm"
-            z="37.51*cm" /> 
-            <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" 
-            rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.3992*cm)" 
-            z="tracking_region_zmax" />
-        </detector> 
-        <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="TrackerBarrelSupports" type="MultiLayerTracker">
+            <layer id="1" inner_r="206.0" outer_z="577.328" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="2" inner_r="456.0" outer_z="749.781" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="3" inner_r="706.0" outer_z="1013.802" vis="InvisibleNoDaughters">
+                <slice material= "CarbonFiber" thickness = "0.05*cm" />
+                <slice material= "Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material= "CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="4" inner_r="956.0" outer_z="1272.251" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+            <layer id="5" inner_r="1206.0" outer_z="1535.676" vis="InvisibleNoDaughters">
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
+                <slice material="CarbonFiber" thickness="0.05*cm" />
+            </layer>
+        </detector>       
+        <detector id="0" name="TrackerReadout" type="DiskTracker" reflect="true">
+            <layer id="1" inner_r="25.7*cm" inner_z="590.402" outer_r="45.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.057*cm" />
+                <slice material="Copper" thickness="0.0038*cm" />
+            </layer>
+            <layer id="2" inner_r="51.0*cm" inner_z="762.854" outer_r="70.6*cm" vis="InvisibleNoDaughters">
+                <slice material = "G10" thickness="0.102*cm" />
+                <slice material = "Copper" thickness="0.0068*cm" />
+            </layer>
+            <layer id="3" inner_r="76.3*cm" inner_z="1026.874" outer_r="95.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.108*cm" />
+                <slice material="Copper" thickness="0.0072*cm" />
+            </layer>
+            <layer id="4" inner_r="101.3*cm" inner_z="1285.322" outer_r="120.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.186*cm" />
+                <slice material="Copper" thickness="0.0124*cm" />
+            </layer>
+            <layer id="5" inner_r= "101.3*cm" inner_z="1610.0" outer_r="120.6*cm" vis="InvisibleNoDaughters">
+                <slice material="G10" thickness="0.246*cm" />
+                <slice material="Copper" thickness="0.0164*cm" />
+            </layer>
+        </detector>
+        <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Titanium"/>
             <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="-tracking_region_zmax" />
             <zplane rmin="1.1925*cm"    rmax="1.2*cm"  z="-6.251*cm"/>
@@ -598,7 +678,7 @@
             <zplane rmin="1.1925*cm" rmax="1.2*cm" z="6.251*cm" />
             <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="tracking_region_zmax" />
         </detector>   
-        <detector id="0" name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Vacuum"/>
             <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
             <zplane rmin="0.*cm" rmax="1.1925*cm"  z="-6.251*cm"/>
@@ -607,530 +687,359 @@
             <zplane rmin="0.*cm" rmax="1.1925*cm" z="6.251*cm" />
             <zplane rmin = "0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)"  z="tracking_region_zmax" />
         </detector>     
-        <detector id="0" name="VXDcableZbackwardOuter" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="VXDcableZbackwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Copper"/>
             <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.4*cm)" 
             rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.404*cm)" 
             z="-tracking_region_zmax" />
             <zplane rmin="1.542*cm"    rmax="1.552*cm"  z="-12.01*cm"/>
         </detector>
-        <detector id="0" name="VXDcableZbackwardInner" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="VXDcableZbackwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Copper"/>
             <zplane rmin="1.455*cm"   rmax="1.467*cm"  z="-9.99*cm"/>
             <zplane rmin="1.32*cm"    rmax="1.332*cm"  z="-6.91*cm"/>
         </detector>
-        <detector id="0" name="VXDcableZforwardOuter" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="VXDcableZforwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Copper"/>
             <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.4*cm)" 
             rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.404*cm)" 
             z="tracking_region_zmax" />
             <zplane rmin="1.542*cm"    rmax="1.552*cm"  z="12.01*cm"/>
         </detector>
-        <detector id="0" name="VXDcableZforwardInner" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="VXDcableZforwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Copper"/>
             <zplane rmin="1.455*cm"   rmax="1.467*cm"  z="9.99*cm"/>
             <zplane rmin="1.32*cm"    rmax="1.332*cm"  z="6.91*cm"/>
         </detector>
-        <detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="G10"/>
             <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="-12.0*cm"/>
             <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="-10.0*cm"/>
         </detector>
-        <detector id="0" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="G10"/>
             <zplane rmin = "1.455*cm"  rmax="1.755*cm"  z="10.0*cm"/>
             <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
         </detector>
-
         <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
-            <layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm">
+            <layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm" vis="InvisibleNoDaughters">
                 <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
             </layer>
-            <layer id="7" inner_r = "18.42*cm" outer_z = "89.48*cm">
+            <layer id="7" inner_r = "18.42*cm" outer_z = "89.48*cm" vis="InvisibleNoDaughters">
                 <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
             </layer>
         </detector>
         <detector id="0" name="VertexEndSupports" type="DiskTracker" reflect="true">    
-            <layer id="7" inner_r = "4.80*cm" inner_z = "86.88*cm" outer_r = "16.87*cm">
+            <layer id="7" inner_r = "4.80*cm" inner_z = "86.88*cm" outer_r = "16.87*cm" vis="InvisibleNoDaughters">
                 <slice material = "CarbonFiber" thickness = "VXD_CF_support" />
             </layer>
-            <layer id="8" inner_r = "4.91*cm" inner_z = "89.43*cm" outer_r = "16.87*cm">
+            <layer id="8" inner_r = "4.91*cm" inner_z = "89.43*cm" outer_r = "16.87*cm" vis="InvisibleNoDaughters">
                 <slice material = "CarbonFiber" thickness = "VXD_CF_support" />
             </layer>
         </detector>
-
         <detector id="0" name="VertexReadout" type="DiskTracker" reflect="true">
-            <layer id="1" inner_r = "1.46*cm" outer_r = "1.66*cm"  inner_z= "6.4*cm" >
+            <layer id="1" inner_r = "1.46*cm" outer_r = "1.66*cm"  inner_z= "6.4*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness ="0.5*cm"/>
             </layer>
-            <layer id="2" inner_r = "2.26*cm" outer_r = "2.46*cm"  inner_z= "6.4*cm" >
+            <layer id="2" inner_r = "2.26*cm" outer_r = "2.46*cm"  inner_z= "6.4*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness ="0.5*cm"/>
             </layer>
-            <layer id="3" inner_r = "3.54*cm" outer_r = "3.74*cm"  inner_z= "6.4*cm" >
+            <layer id="3" inner_r = "3.54*cm" outer_r = "3.74*cm"  inner_z= "6.4*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness ="0.5*cm"/>
             </layer>
-            <layer id="4" inner_r = "4.80*cm" outer_r = "5.00*cm"  inner_z= "6.4*cm" >
+            <layer id="4" inner_r = "4.80*cm" outer_r = "5.00*cm"  inner_z= "6.4*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness ="0.5*cm"/>
             </layer>
-            <layer id="5" inner_r = "6.04*cm" outer_r = "6.24*cm"  inner_z= "6.4*cm" >
+            <layer id="5" inner_r = "6.04*cm" outer_r = "6.24*cm"  inner_z= "6.4*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness ="0.5*cm"/>
             </layer>
-            <layer id="6" inner_r = "1.32*cm" outer_r = "2.26*cm"  inner_z= "6.90*cm" >
+            <layer id="6" inner_r = "1.32*cm" outer_r = "2.26*cm"  inner_z= "6.90*cm" vis="InvisibleNoDaughters">
                 <slice material = "Copper" thickness ="0.0057*cm"/>
             </layer>
-            <layer id="7" inner_r = "2.261*cm" outer_r = "3.54*cm"  inner_z= "6.90*cm" >
+            <layer id="7" inner_r = "2.261*cm" outer_r = "3.54*cm"  inner_z= "6.90*cm" vis="InvisibleNoDaughters">
                 <slice material = "Copper" thickness ="0.0031*cm"/>
             </layer>
-            <layer id="8" inner_r = "3.541*cm" outer_r = "4.80*cm"  inner_z= "6.90*cm" >
+            <layer id="8" inner_r = "3.541*cm" outer_r = "4.80*cm"  inner_z= "6.90*cm" vis="InvisibleNoDaughters">
                 <slice material = "Copper" thickness ="0.0016*cm"/>
             </layer>
-            <layer id="9" inner_r = "4.801*cm" outer_r = "6.04*cm"  inner_z= "6.90*cm" >
+            <layer id="9" inner_r = "4.801*cm" outer_r = "6.04*cm"  inner_z= "6.90*cm" vis="InvisibleNoDaughters">
                 <slice material = "Copper" thickness ="0.0007*cm"/>
             </layer>
-            <layer id="10" inner_r = "1.3*cm"  outer_r = "1.399*cm" inner_z = "6.98*cm">
+            <layer id="10" inner_r = "1.3*cm"  outer_r = "1.399*cm" inner_z = "6.98*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="11" inner_r = "1.5*cm"  outer_r = "1.599*cm" inner_z = "8.82*cm">
+            <layer id="11" inner_r = "1.5*cm"  outer_r = "1.599*cm" inner_z = "8.82*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="12" inner_r = "1.7*cm"  outer_r = "1.799*cm" inner_z = "11.96*cm">
+            <layer id="12" inner_r = "1.7*cm"  outer_r = "1.799*cm" inner_z = "11.96*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="13" inner_r = "1.9*cm"  outer_r = "1.999*cm" inner_z = "16.80*cm">
+            <layer id="13" inner_r = "1.9*cm"  outer_r = "1.999*cm" inner_z = "16.80*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="14" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "6.98*cm">
+            <layer id="14" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "6.98*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="15" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "8.82*cm">
+            <layer id="15" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "8.82*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="16" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "11.96*cm">
+            <layer id="16" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "11.96*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
-            <layer id="17" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "16.80*cm">
+            <layer id="17" inner_r = "7.101*cm"  outer_r = "7.6*cm" inner_z = "16.80*cm" vis="InvisibleNoDaughters">
                 <slice material = "G10" thickness = "0.2*cm" />
             </layer>
         </detector>
-
-        <detector id="0" name="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>
-            <layer id="5" inner_r="1206.0" outer_z="1535.676">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-        </detector>       
-
-        <detector id="0" name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="750.417-0.001" />
             <zplane rmin="504.711" rmax="510.448" z="750.919-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="777.034-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="777.535-0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport2" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport2" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="510.448" rmax="510.448" z="750.919" />
             <zplane rmin="438.449" rmax="510.448" z="757.218" />
             <zplane rmin="206.234" rmax="278.187" z="777.535" />
             <zplane rmin="206.234" rmax="206.234" z="783.834" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport3" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport3" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="757.218+0.001" />
             <zplane rmin="504.711" rmax="510.448" z="757.720+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="783.834+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="784.336+0.001 " />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport4" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport4" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="763.796" rmax="763.796" z="1014.437-0.001" />
             <zplane rmin="758.059" rmax="763.796" z="1014.939-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="1063.219-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="1063.721-0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport5" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport5" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="763.796" rmax="763.796" z="1014.939" />
             <zplane rmin="691.797" rmax="763.796" z="1021.238" />
             <zplane rmin="206.234" rmax="278.187" z="1063.721" />
             <zplane rmin="206.234" rmax="206.234" z="1070.020" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport6" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport6" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="763.796" rmax="763.796" z="1021.238+0.001" />
             <zplane rmin="758.059" rmax="763.796" z="1021.740+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="1070.020+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="1070.522+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport7" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport7" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1015.748" rmax="1015.748" z="1272.885-0.001" />
             <zplane rmin="1010.011" rmax="1015.748" z="1273.387-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="1343.711-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="1344.213-0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport8" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport8" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="1015.748" rmax="1015.748" z="1273.387" />
             <zplane rmin="943.753" rmax="1015.748" z="1279.686" />
             <zplane rmin="206.234" rmax="278.187" z="1344.213" />
             <zplane rmin="206.234" rmax="206.234" z="1350.512" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport9" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport9" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1015.748" rmax="1015.748" z="1279.686+0.001" />
             <zplane rmin="1010.011" rmax="1015.748" z="1280.188+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="1350.512+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="1351.014+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport10" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport10" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1263.808" rmax="1263.808" z="1536.560-0.001" />
             <zplane rmin="1258.071" rmax="1263.808" z="1537.062-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="1629.089-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="1629.591-0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport11" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport11" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="1263.808" rmax="1263.808" z="1537.062" />
             <zplane rmin="1191.810" rmax="1263.808" z="1543.361" />
             <zplane rmin="206.234" rmax="278.187" z="1629.591" />
             <zplane rmin="206.234" rmax="206.234" z="1635.890" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport12" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport12" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1263.808" rmax="1263.808" z="1543.361+0.001" />
             <zplane rmin="1258.071" rmax="1263.808" z="1543.863+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="1635.890+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="1636.392+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport1Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport1Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="-750.417+0.001" />
             <zplane rmin="504.711" rmax="510.448" z="-750.919+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-777.034+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-777.535+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport2Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport2Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="510.448" rmax="510.448" z="-750.919" />
             <zplane rmin="438.449" rmax="510.448" z="-757.218" />
             <zplane rmin="206.234" rmax="278.187" z="-777.535" />
             <zplane rmin="206.234" rmax="206.234" z="-783.834" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport3Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport3Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="-757.218-0.001" />
             <zplane rmin="504.711" rmax="510.448" z="-757.720-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-783.834-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-784.336-0.001 " />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport4Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport4Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="763.796" rmax="763.796" z="-1014.437+0.001" />
             <zplane rmin="758.059" rmax="763.796" z="-1014.939+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1063.219+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1063.721+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport5Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport5Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="763.796" rmax="763.796" z="-1014.939" />
             <zplane rmin="691.797" rmax="763.796" z="-1021.238" />
             <zplane rmin="206.234" rmax="278.187" z="-1063.721" />
             <zplane rmin="206.234" rmax="206.234" z="-1070.020" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport6Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport6Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="763.796" rmax="763.796" z="-1021.238-0.001" />
             <zplane rmin="758.059" rmax="763.796" z="-1021.740-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1070.020-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1070.522-0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport7Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport7Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1015.748" rmax="1015.748" z="-1272.885+0.001" />
             <zplane rmin="1010.011" rmax="1015.748" z="-1273.387+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1343.711+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1344.213+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport8Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport8Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="1015.748" rmax="1015.748" z="-1273.387" />
             <zplane rmin="943.753" rmax="1015.748" z="-1279.686" />
             <zplane rmin="206.234" rmax="278.187" z="-1344.213" />
             <zplane rmin="206.234" rmax="206.234" z="-1350.512" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport9Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport9Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1015.748" rmax="1015.748" z="-1279.686-0.001" />
             <zplane rmin="1010.011" rmax="1015.748" z="-1280.188-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1350.512-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1351.014-0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport10Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport10Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1263.808" rmax="1263.808" z="-1536.560+0.001" />
             <zplane rmin="1258.071" rmax="1263.808" z="-1537.062+0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1629.089+0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1629.591+0.001" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport11Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport11Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="Rohacell31"/>
             <zplane rmin="1263.808" rmax="1263.808" z="-1537.062" />
             <zplane rmin="1191.810" rmax="1263.808" z="-1543.361" />
             <zplane rmin="206.234" rmax="278.187" z="-1629.591" />
             <zplane rmin="206.234" rmax="206.234" z="-1635.890" />
         </detector>
-
-        <detector id="0" name="SiTrackerEndcapSupport12Reflect" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="SiTrackerEndcapSupport12Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="1263.808" rmax="1263.808" z="-1543.361-0.001" />
             <zplane rmin="1258.071" rmax="1263.808" z="-1543.863-0.001" />
             <zplane rmin="206.234" rmax="211.970" z="-1635.890-0.001" />
             <zplane rmin="206.234" rmax="206.234" z="-1636.392-0.001" />
         </detector>
-        <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" />
-                <slice material="Copper" thickness="0.0038*cm" />
-            </layer>
-            <layer id="2" inner_r="51.0*cm" inner_z="762.854" outer_r="70.6*cm">
-                <slice material = "G10" thickness="0.102*cm" />
-                <slice material = "Copper" thickness="0.0068*cm" />
-            </layer>
-            <layer id="3" inner_r="76.3*cm" inner_z="1026.874" outer_r="95.6*cm">
-                <slice material="G10" thickness="0.108*cm" />
-                <slice material="Copper" thickness="0.0072*cm" />
-            </layer>
-            <layer id="4" inner_r="101.3*cm" inner_z="1285.322" outer_r="120.6*cm">
-                <slice material="G10" thickness="0.186*cm" />
-                <slice material="Copper" thickness="0.0124*cm" />
-            </layer>
-            <layer id="5" inner_r= "101.3*cm" inner_z="1610.0" outer_r="120.6*cm">
-                <slice material="G10" thickness="0.246*cm" />
-                <slice material="Copper" thickness="0.0164*cm" />
-            </layer>
-        </detector>
-        <detector id="2" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VertexEndcapHits" combineHits="true">
-            <layer id="1" inner_r = "1.4*cm" inner_z = "7.18*cm" outer_r = "7.1*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.0093*cm" />
-            </layer>
-            <layer id="2" inner_r = "1.6*cm" inner_z = "9.02*cm" outer_r = "7.1*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.0093*cm" />
-            </layer>
-            <layer id="3" inner_r = "1.8*cm" inner_z = "12.16*cm" outer_r = "7.1*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.0093*cm" />
-            </layer>
-            <layer id="4" inner_r = "2.0*cm" inner_z = "17.0*cm" outer_r = "7.1*cm" >
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
-                <slice material = "Silicon" thickness = "0.0093*cm" />
-            </layer>
-        </detector>
-        <detector id="15" name="TrackerForward" type="DiskTracker" reflect="true" readout="TrackerForwardHits">
-            <layer id="1" inner_r = "2.78*cm" inner_z = "20.4*cm" outer_r = "16.67*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-                <slice material = "Silicon" thickness = "0.028*cm" />
-                <slice material = "CarbonFiber_25percent" thickness="VXD_CF_sensor" />
-            </layer>
-            <layer id="2" inner_r = "7.51*cm" inner_z = "53.85*cm" outer_r = "16.67*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-                <slice material = "Silicon" thickness = "0.028*cm" />
-                <slice material = "CarbonFiber_25percent" thickness="VXD_CF_sensor" />
-            </layer>
-            <layer id="3" inner_r = "11.65*cm" inner_z = "82.95*cm" outer_r = "16.67*cm">
-                <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
-                <slice material = "Silicon" thickness = "0.028*cm" />
-                <slice material = "CarbonFiber_25percent" thickness="VXD_CF_sensor" />
-            </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="Vacuum" thickness="SolenoidBarrelInnerAirgapThickness" />
-            </layer>
-            <layer id="2" inner_r="SolenoidBarrelConductorInnerRadius" outer_z="SolenoidCoilOuterZ">
-                <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness" />
-                <slice material="Aluminum" thickness="SolenoidBarrelQuenchbackThickness" />
-            </layer>
-            <layer id="3" inner_r="SolenoidBarrelOuterCryostatInnerRadius" outer_z="SolenoidBarrelOuterZ">
-                <slice material="Vacuum" 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="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits">
-            <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
-            <layer repeat="20" >
-                <slice material = "TungstenDens24" thickness = "0.271*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-            <layer repeat="10" >
-                <slice material = "TungstenDens24" thickness = "0.543*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-        </detector>
-
-        <detector id="0" name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="false">
+        <detector id="0" name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="TungstenDens24"/>
             <zplane rmin = "8.0*cm" rmax="15.5*cm" z="182.0*cm" />
             <zplane rmin="13.78*cm" rmax="15.5*cm"  z="313.5*cm"/>
         </detector>
-        <detector id="0" name="ForwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false">
+        <detector id="0" name="ForwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="Steel235"/>
             <zplane rmin = "15.5*cm" rmax="19.5*cm" z="182.0*cm" />
             <zplane rmin="15.5*cm" rmax="19.5*cm"  z="323.5*cm"/>
         </detector>        
-        
-
-        <detector id="0" name="BackwardM1" type="PolyconeSupport" insideTrackingVolume="false">
+        <detector id="0" name="BackwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="TungstenDens24"/>
             <zplane rmin="13.78*cm" rmax="15.5*cm"  z="-313.5*cm"/>
             <zplane rmin = "8.0*cm" rmax="15.5*cm" z="-182.0*cm" />
         </detector>
-        <detector id="0" name="BackwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false">
+        <detector id="0" name="BackwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="Steel235"/>
             <zplane rmin="15.5*cm" rmax="19.5*cm"  z="-323.5*cm"/>
             <zplane rmin = "15.5*cm" rmax="19.5*cm" z="-182.0*cm" />
         </detector>        
-        
-        <detector id="0" name="ForwardLowZ" type="ForwardDetector" reflect="true" >
+        <detector id="0" name="ForwardLowZ" type="ForwardDetector" reflect="true" vis="InvisibleNoDaughters">
             <dimensions outer_r="12.39*cm" inner_r="0.0*cm" inner_z="282.0*cm" />
             <beampipe crossing_angle="0.014" outgoing_r="1.2*cm" incoming_r="1.0*cm" />
             <layer repeat="1">
                 <slice material = "BoratedPolyethylene5" thickness = "13.0*cm" sensitive = "no" />
             </layer>
         </detector>
-
-        <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits">
-            <dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
-            <beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
-            <layer repeat="50">
-                <slice material="TungstenDens24" thickness="0.271*cm" />
-                <slice material="Silicon" thickness="0.032*cm" sensitive="yes" />
-                <slice material="Copper" thickness="0.005*cm" />
-                <slice material="Kapton" thickness="0.030*cm" />
-                <slice material="Air" thickness="0.033*cm" />
-            </layer>
-        </detector>
-
-        <detector id="0" name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false">
+        <detector id="0" name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="Vacuum"/>
             <zplane rmin="0.*cm" rmax="6.0*cm"    z="tracking_region_zmax" />
             <zplane rmin="0.*cm" rmax="6.0*cm"    z="182*cm" />
             <zplane rmin="0.*cm" rmax="12.4*cm"  z="282*cm"/>
         </detector> 
-
-        <detector id="0" name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false">
+        <detector id="0" name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="Vacuum"/>
             <zplane rmin="0.*cm" rmax="12.4*cm"  z="-282*cm"/>
             <zplane rmin="0.*cm" rmax="6.0*cm"    z="-182*cm" />
             <zplane rmin="0.*cm" rmax="6.0*cm"    z="-tracking_region_zmax" />
         </detector>   
-        
-        <detector id="0" name="NorthIncomingBeampipe" type="TubeSegment">
+        <detector id="0" name="NorthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
             <material name="Iron" />
             <tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
             <position x="-2.13*cm" y="0" z="304.27*cm" />
             <rotation x="0.0" y="0.0070" z="0.0" />
         </detector>
-
-        <detector id="0" name="SouthIncomingBeampipe" type="TubeSegment">
+        <detector id="0" name="SouthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
             <material name="Iron" />
             <tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
             <position x="-2.13*cm" y="0" z="-304.27*cm" />
             <rotation x="0.0" y="-0.0070" z="0.0" />
         </detector>
-
-        <detector id="0" name="NorthOutgoingBeampipe" type="TubeSegment">
+        <detector id="0" name="NorthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
             <material name="Iron" />
             <tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
             <position x="2.13*cm" y="0" z="304.27*cm" />
             <rotation x="0.0" y="-0.0070" z="0.0" />
         </detector>
-
-        <detector id="0" name="SouthOutgoingBeampipe" type="TubeSegment">
+        <detector id="0" name="SouthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
             <material name="Iron" />
             <tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
             <position x="2.13*cm" y="0" z="-304.27*cm" />
             <rotation x="0.0" y="0.0070" z="0.0" />
         </detector>        
-        <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">    
-            <module name="SiTrackerForwardModule">
-                <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="22.7" outer_r="166.7" inner_z="206.225" thickness="1.0" nwedges="12" module="SiTrackerForwardModule">
-                <module_parameters r_size="18.0" phi_size_max="5" />
+        <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
+            <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
+                <slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
+                <slice material="Vacuum" thickness="SolenoidBarrelInnerAirgapThickness" />
+            </layer>
+            <layer id="2" inner_r="SolenoidBarrelConductorInnerRadius" outer_z="SolenoidCoilOuterZ" vis="SolenoidBarrelLayerVis">
+                <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness" />
+                <slice material="Aluminum" thickness="SolenoidBarrelQuenchbackThickness" />
+            </layer>
+            <layer id="3" inner_r="SolenoidBarrelOuterCryostatInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
+                <slice material="Vacuum" 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" vis="SolenoidBarrelLayerVis">
+                <slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
             </layer>
-            <layer id="2" inner_r="76.7" outer_r="166.7" inner_z="540.677" thickness="1.0" nwedges="12" module="SiTrackerForwardModule">
-                <module_parameters r_size="18.0" phi_size_max="5" />
-            </layer>    
-            <layer id="3" inner_r="112.7" outer_r="166.7" inner_z="831.761" thickness="1.0" nwedges="12" module="SiTrackerForwardModule">
-                <module_parameters r_size="18.0" phi_size_max="5" />
-            </layer>        
         </detector>
-        -->
     </detectors>
     <readouts>
         <readout name="SiTrackerEndcapHits">
@@ -1181,22 +1090,11 @@
             <segmentation type="GridXYZ" gridSizeX="0.35*cm" gridSizeY="0.35*cm" />
             <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id>
         </readout>
-<!--
-        <readout name="VertexEndcapHits">
-            <id>system:8,layer:8,barrel:3</id>
-        </readout>
-        <readout name="TrackerForwardHits">
-            <id>system:8,layer:8,barrel:3</id>
-        </readout>
--->
     </readouts>
     <fields>
-        <!-- TODO: Needs to be updated with current numbers. -->
-        <field type="Solenoid" 
-        name="GlobalSolenoid"
-        inner_field="5.0"
-        outer_field="-0.6"
-        zmax="1000"
-        outer_radius="(250.0+ 5.0 + 17.5 + 40./2.)*cm" />
+    	<!-- TODO: Needs to be updated with current numbers. -->
+    	<field type="Solenoid" name="GlobalSolenoid" inner_field="5.0"
+    		outer_field="-0.6" zmax="1000"
+    		outer_radius="(250.0+ 5.0 + 17.5 + 40./2.)*cm" />
     </fields>
-</lccdd>
+</lccdd>
\ No newline at end of file
CVSspam 0.2.8