Commit in LCDetectors/detectors/sid01_planar_tracker on MAIN
compact.xml+89-381.3 -> 1.4
Added Vertex detector model, including endcaps.

LCDetectors/detectors/sid01_planar_tracker
compact.xml 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- compact.xml	18 Apr 2008 23:13:23 -0000	1.3
+++ compact.xml	29 Apr 2008 22:11:45 -0000	1.4
@@ -7,7 +7,7 @@
         title="Silicon Detector v01 with Planar Trackers"
         author="Jeremy McCormick and Tim Nelson"
         status="development"
-        version="$Id: compact.xml,v 1.3 2008/04/18 23:13:23 tknelson Exp $">
+        version="$Id: compact.xml,v 1.4 2008/04/29 22:11:45 tknelson Exp $">
     <comment></comment>
   </info>
 
@@ -71,7 +71,6 @@
 
   <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"
@@ -161,6 +160,61 @@
       <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
     </detector>
 
+
+
+    <detector id="11" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrel_RO" vis="VertexVis">
+      <module name="VtxBarrelModuleInner">
+	<module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
+	<module_component width="7.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
+	  <position z="-0.08"/>
+	</module_component>
+	<module_component width="7.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
+	  <position z="0.075"/>
+	</module_component>
+	<module_component width="9.6" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
+	  <position z="0.150"/>
+	</module_component>
+      </module>
+      <module name="VtxBarrelModuleOuter">
+	<module_envelope width="14.0" length="126.0" thickness="0.6"/>
+	<module_component width="11.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
+	  <position z="-0.08"/>
+	</module_component>
+	<module_component width="11.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
+	  <position z="0.075"/>
+	</module_component>
+	<module_component width="13.8" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
+	  <position z="0.150"/>
+	</module_component>
+      </module>
+      <layer module="VtxBarrelModuleInner" id="1">
+	<barrel_envelope inner_r="13.0" outer_r="17.0" z_length="63 * 2"/>
+	<rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="15.05" dr="-1.15"/>
+	<z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="2">
+	<barrel_envelope inner_r="21.0" outer_r="25.0" z_length="63 * 2"/>
+	<rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="23.03" dr="-1.13"/>
+	<z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="3">
+	<barrel_envelope inner_r="34.0" outer_r="38.0" z_length="63 * 2"/>
+	<rphi_layout phi_tilt="0.0" nphi="18" phi0="0.0" rc="35.79" dr="-0.89"/>
+	<z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="4">
+	<barrel_envelope inner_r="46.6" outer_r="50.6" z_length="63 * 2"/>
+	<rphi_layout phi_tilt="0.0" nphi="24" phi0="0.1309" rc="47.5" dr="0.81"/>
+	<z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+      <layer module="VtxBarrelModuleOuter" id="5">
+	<barrel_envelope inner_r="59.0" outer_r="63.0" z_length="63 * 2"/>
+	<rphi_layout phi_tilt="0.0" nphi="30" phi0="0.0" rc="59.9" dr="0.77"/>
+	<z_layout dr="0.0" z0="0.0" nz="1"/>
+      </layer>
+    </detector>
+
+<!--
     <detector id="11" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits" combineHits="true">
       <layer id="1" inner_r = "1.461*cm" outer_z = "6.25*cm">
         <slice material = "Silicon" thickness = "0.0093*cm"/>
@@ -183,8 +237,35 @@
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes" />
       </layer>
     </detector>
+-->
+
+        <detector id="12" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcap_RO" vis="TestVis">
+            
+            <module name="SiVertexEndcapModule">
+                <module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
+                <module_component thickness="0.0093*cm"   material="Silicon" />        
+            </module>
+
+            <layer id="1" inner_r="1.4*cm" outer_r="7.1*cm" inner_z="7.18*cm" thickness="0.02*cm" nwedges="12">
+                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+            </layer>
+
+            <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.02*cm" nwedges="12">
+                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+            </layer>
+
+            <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.02*cm" nwedges="12">
+                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+            </layer>
+
+            <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.02*cm" nwedges="12">
+                <module_parameters module="SiTrackerEndcapModule_Layer0" r_size="10.0" phi_size_max="10.0" />
+            </layer>
+
+        </detector>
 
 
+<!--
     <detector id="12" name="VertexEndcap" type="DiskTracker" reflect="true" readout="VtxEndcapHits" combineHits="true">
       <layer id="1" inner_r = "1.4*cm" inner_z = "7.18*cm" outer_r = "7.1*cm">
         <slice material = "Silicon" thickness = "0.002*cm" sensitive = "yes"/>
@@ -203,6 +284,7 @@
         <slice material = "Silicon" thickness = "0.0093*cm" />
       </layer>
     </detector>
+-->
 
     <detector id="0" name="VertexBarrelSupports" type="MultiLayerTracker">
       <layer id="1" inner_r = "1.43*cm" outer_z = "6.27*cm">
@@ -337,7 +419,6 @@
       </layer>
     </detector>
 
--->
 
     <detector id="13" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO">
 
@@ -840,37 +921,7 @@
 
         <detector id="15" name="SiTrackerForward" type="SiTrackerForward" readout="SiTrackerForward_RO" vis="TestVis">
             
-            <module name="SiTrackerForwardModule_Layer0">
-                <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>
-            
-            <module name="SiTrackerForwardModule_Layer1">
-                <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>
-            
-            <module name="SiTrackerForwardModule_Layer2">
+            <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" />
@@ -884,18 +935,18 @@
                 <module_component thickness="0.0038*cm"   material="Kapton" />
                 <module_component thickness="0.00038*cm"   material="Copper" />
             </module>
-            
+                        
             <!-- Forward Tracker Layers -->       
             <layer id="1" inner_r="27.800" outer_r="166.7" inner_z="204.0" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerForwardModule_Layer0" r_size="41.1" phi_size_max="50" />
+                <module_parameters module="SiTrackerForwardModule" r_size="41.1" phi_size_max="50" />
             </layer>
             
             <layer id="2" inner_r="75.1" outer_r="166.7" inner_z="538.5" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerForwardModule_Layer1" r_size="41.1" phi_size_max="50" />
+                <module_parameters module="SiTrackerForwardModule" r_size="41.1" phi_size_max="50" />
             </layer>
             
             <layer id="3" inner_r="116.5" outer_r="166.7" inner_z="829.5" thickness="10.0" nwedges="24">
-                <module_parameters module="SiTrackerForwardModule_Layer2" r_size="41.4" phi_size_max="50" />
+                <module_parameters module="SiTrackerForwardModule" r_size="41.4" phi_size_max="50" />
             </layer>        
             
         </detector>
CVSspam 0.2.8