Commit in LCDetectors/detectors/sidloi on MAIN
compact.xml+40-341.8 -> 1.9
back out SiVertexEndcap modifications for the time being.

LCDetectors/detectors/sidloi
compact.xml 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- compact.xml	4 Feb 2009 19:48:13 -0000	1.8
+++ compact.xml	4 Feb 2009 20:02:36 -0000	1.9
@@ -1,12 +1,12 @@
 <lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" 
-       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" 
-       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+    xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" 
+    xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
     <info name="sidloi"
         title="Silicon Detector LOI"
         author="Norman Graf, Jeremy McCormick"
         url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
         status="development"
-        version="$Id: compact.xml,v 1.8 2009/02/04 19:48:13 ngraf Exp $">
+        version="$Id: compact.xml,v 1.9 2009/02/04 20:02:36 ngraf Exp $">
         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>
@@ -16,10 +16,10 @@
         <constant name="world_z" value="world_side"/>
         <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"/>
@@ -325,7 +325,7 @@
             <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">
             <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" />
@@ -333,7 +333,7 @@
             <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">
             <material name="Rohacell31"/>
             <zplane rmin="1015.748" rmax="1015.748" z="1273.387" />
             <zplane rmin="943.753" rmax="1015.748" z="1279.686" />
@@ -421,7 +421,7 @@
             <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">
             <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" />
@@ -429,7 +429,7 @@
             <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">
             <material name="Rohacell31"/>
             <zplane rmin="1015.748" rmax="1015.748" z="-1273.387" />
             <zplane rmin="943.753" rmax="1015.748" z="-1279.686" />
@@ -586,7 +586,7 @@
                 <slice material = "CarbonFiber_25percent" thickness="VXD_CF_sensor" />
             </layer>
         </detector> 
-
+ <!--
         <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
             <module name="SiVertexEndcapModule">
                 <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
@@ -607,7 +607,7 @@
                 <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"/>                
@@ -855,6 +855,8 @@
                 <ring r="1206.937" zstart="1555.647+1.75" nmodules="84" dz="1.75" module="Module2"/>
             </layer>
         </detector>
+        
+        <!-- EM Calorimeter -->
 
         <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits">
             <dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
@@ -879,6 +881,7 @@
                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>
+        
         <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter" reflect="true" readout="EcalEndcapHits">
             <dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="260.0" rmax="1264.5" />
             <layer repeat="1">
@@ -903,6 +906,9 @@
             </layer>
         </detector>
 
+        
+        <!-- Hadronic Calorimeter  -->
+        
         <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits">
             <dimensions numsides="12" rmin="1419.0" z="3018.0 * 2"/>
             <layer repeat="40">
@@ -951,7 +957,7 @@
         </detector>        
         
         
-    <!-- Muon System -->
+        <!-- Muon System -->
 
         <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits">
             <!-- TODO: Check the z value. -->
@@ -1115,23 +1121,23 @@
         </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="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>
+        <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="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>
@@ -1193,10 +1199,10 @@
     <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" />
+        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>
CVSspam 0.2.8