LCDetectors/detectors/sidloi
diff -u -r1.4 -r1.5
--- compact.xml 4 Feb 2009 05:07:03 -0000 1.4
+++ compact.xml 4 Feb 2009 18:50:22 -0000 1.5
@@ -561,7 +561,6 @@
</layer>
</detector>
-<!--
<detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
<module name="SiVertexEndcapModule">
<module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
@@ -569,20 +568,20 @@
<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 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">
+ <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="12" module="SiVertexEndcapModule">
- <module_parameters r_size="19.0" phi_size_max="9.0" />
+ <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">
+ <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="12" module="SiVertexEndcapModule">
- <module_parameters r_size="19.0" phi_size_max="9.0" />
+ <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">
+ <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="12" module="SiVertexEndcapModule">
- <module_parameters r_size="19.0" phi_size_max="9.0" />
+ <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">
+ <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"/>
@@ -1091,38 +1090,25 @@
<slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
</layer>
</detector>
+-->
- <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">
-
+ <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_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="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>
-
+ <layer id="1" inner_r="22.7" outer_r="166.7" inner_z="206.225" thickness="10.0" nwedges="12" module="SiTrackerEndcapModule">
+ <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">
+ <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">
+ <module_parameters r_size="18.0" phi_size_max="5" />
+ </layer>
</detector>
--->
</detectors>
<readouts>