Commit in LCDetectors/detectors/sidloi on MAIN
compact.xml+15-181.10 -> 1.11
JM: put in planar vtx endcap and forward tracker; up to date with normans work on solenoid

LCDetectors/detectors/sidloi
compact.xml 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- compact.xml	4 Feb 2009 20:04:55 -0000	1.10
+++ compact.xml	4 Feb 2009 21:42:28 -0000	1.11
@@ -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.10 2009/02/04 20:04:55 ngraf Exp $">
+        version="$Id: compact.xml,v 1.11 2009/02/04 21:42:28 jeremy Exp $">
         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>
@@ -548,7 +548,7 @@
                 <z_layout dr="0.0" z0="0.0" nz="1"/>
             </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"/>
@@ -567,8 +567,9 @@
                 <slice material = "Silicon" thickness = "0.0093*cm" />
             </layer>
         </detector>
-
+-->
         <!-- Forward Tracker Modules inside the support tube -->
+<!--
         <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" />
@@ -585,8 +586,8 @@
                 <slice material = "Silicon" thickness = "0.028*cm" />
                 <slice material = "CarbonFiber_25percent" thickness="VXD_CF_sensor" />
             </layer>
-        </detector> 
- <!--
+        </detector>
+--> 
         <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
             <module name="SiVertexEndcapModule">
                 <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
@@ -594,20 +595,19 @@
                 <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="16" module="SiTrackerEndcapModule">
+            <layer id="1" inner_r="1.4*cm" outer_r="7.1*cm" inner_z="7.18*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule">
                 <module_parameters r_size="19.0" phi_size_max="5.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="16" module="SiTrackerEndcapModule">
+            <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule">
                 <module_parameters r_size="19.0" phi_size_max="5.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="16" module="SiTrackerEndcapModule">
+            <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule">
                 <module_parameters r_size="19.0" phi_size_max="5.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="16" module="SiTrackerEndcapModule">
+            <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule">
                 <module_parameters r_size="19.0" phi_size_max="5.0" />
             </layer>
         </detector>
--->
         <detector id="3" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrelHits">
             <module name="SiTrackerModule_Layer1">                
                 <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
@@ -1119,9 +1119,6 @@
             <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" />
@@ -1129,18 +1126,16 @@
                 <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="10.0" nwedges="12" module="SiTrackerEndcapModule">
+            <layer id="1" inner_r="22.7" outer_r="166.7" inner_z="206.225" thickness="10.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="10.0" nwedges="12" module="SiTrackerEndcapModule">
+            <layer id="2" inner_r="76.7" outer_r="166.7" inner_z="540.677" thickness="10.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="10.0" nwedges="12" module="SiTrackerEndcapModule">
+            <layer id="3" inner_r="112.7" outer_r="166.7" inner_z="831.761" thickness="10.0" nwedges="12" module="SiTrackerForwardModule">
                 <module_parameters r_size="18.0" phi_size_max="5" />
             </layer>        
         </detector>
-    -->
-    
     </detectors>
     <readouts>
         <readout name="SiTrackerEndcapHits">
@@ -1191,12 +1186,14 @@
             <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. -->
CVSspam 0.2.8