LCDetectors/detectors/sid02

diff -u -r1.4 -r1.5
--- compact.xml	27 Aug 2008 21:45:02 -0000	1.4
+++ compact.xml	27 Aug 2008 23:45:48 -0000	1.5
@@ -8,7 +8,7 @@

         author="Norman Graf"
         url="http://confluence.slac.stanford.edu/display/ilc/sid02"
         status="development"

-        version="$Id: compact.xml,v 1.4 2008/08/27 21:45:02 ngraf Exp $">

+        version="$Id: compact.xml,v 1.5 2008/08/27 23:45:48 ngraf Exp $">

         <comment>The compact format for the Silicon Detector v02 to be used in the LOI 080826</comment>
     </info>
 

@@ -858,14 +858,15 @@

 
         <!-- Instrumented luminosity monitor -->
 

-        <detector id="10" name="ForwardLuminosityMonitor" reflect="true" type="CylindricalEndcapCalorimeter" readout="LuminosityMonitorHits">
-            <dimensions inner_r = "2.0*cm" inner_z = "295.0*cm" outer_r = "14.28*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" />

+        <detector id="10" name="ForwardLuminosityMonitor" reflect="true" type="ForwardDetector" readout="LuminosityMonitorHits">
+            <dimensions outer_r="14.28*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
+            <beampipe crossing_angle="0.014" outgoing_r="1.5*cm" incoming_r="1.0*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>
     

@@ -883,7 +884,35 @@

             <material name="Vacuum"/>
             <zplane rmin="0.*cm" rmax="13.8*cm"  z="-285*cm"/>
             <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />

-        </detector>     

+        </detector>   
+  
+        <detector id="0" name="NorthIncomingBeampipe" type="TubeSegment">
+            <material name="Iron" />
+            <tubs rmin=".95*cm" rmax="1.0*cm" zhalf="9.28*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">
+            <material name="Iron" />
+            <tubs rmin=".95*cm" rmax="1.0*cm" zhalf="9.28*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">
+            <material name="Iron" />
+            <tubs rmin="1.45*cm" rmax="1.5*cm" zhalf="9.28*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">
+            <material name="Iron" />
+            <tubs rmin="1.45*cm" rmax="1.5*cm" zhalf="9.28*cm" />
+            <position x="-2.13*cm" y="0" z="-304.27*cm" />
+            <rotation x="0.0" y="-0.0070" z="0.0" />
+        </detector>        

 
     </detectors>