Commit in LCDetectors/detectors/gldaug05 on MAIN
compact.xml+53-321.4 -> 1.5
Added beampipe, solenoid and muon system.

LCDetectors/detectors/gldaug05
compact.xml 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- compact.xml	18 Aug 2005 07:45:31 -0000	1.4
+++ compact.xml	19 Aug 2005 16:46:33 -0000	1.5
@@ -4,7 +4,7 @@
        xs:noNamespaceSchemaLocation="noNamespaceUrl">
 
   <!--
-      TODO: Define TPC compact description.
+      TODO: Define TPC compact description. Add in forward elements
   -->
 
   <!-- info tag containing author, version, time, unique id (url) -->
@@ -12,7 +12,7 @@
         title="GLD August 2005 (Snowmass)"
 	author="Norman Graf"
 	url="http://confluence.slac.stanford.edu/display/ilc/gldaug05">
-    <comment>The compact format for the gldaug05 detector studied at Snowmass. v0.1 050817</comment>
+    <comment>The compact format for the gldaug05 detector studied at Snowmass. v0.2 050819</comment>
   </info>
 
   <!-- Constants -->
@@ -41,18 +41,26 @@
 
         <!-- Beampipe -->
        
-        <detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
+        <detector id="0" name="BeamPipeCenter" type="PolyconeSupport" insideTrackingVolume="true">
             <material name="Beryllium"/>
-            <zplane rmin = "9.1*cm" rmax="9.2*cm" z="-110.0*cm" />
-            <zplane rmin="4.3*cm" rmax="4.4*cm"   z="-35.0*cm"/>
-            <zplane rmin="4.3*cm" rmax="4.4*cm" z="-25.0*cm"/>
-            <zplane rmin="1.725*cm" rmax="1.825*cm" z="-5.5*cm" />
-            <zplane rmin="1.725*cm" rmax="1.825*cm" z="5.5*cm" />
-            <zplane rmin="4.3*cm" rmax="4.4*cm" z="25.0*cm" />
-            <zplane rmin="4.3*cm" rmax="4.4*cm" z="35.0*cm" />
-            <zplane rmin="9.1*cm" rmax="9.2*cm" z="110.0*cm" />
-        </detector>        
-        
+            <zplane rmin="1.8*cm" rmax="1.825*cm" z="-5.5*cm" />
+            <zplane rmin="1.8*cm" rmax="1.825*cm" z="5.5*cm" />
+        </detector>   
+        <detector id="0" name="BeamPipeBackward" type="PolyconeSupport" insideTrackingVolume="true">
+            <material name="Aluminum"/>
+            <zplane rmin="9.0*cm" rmax="9.2*cm" z="-110.0*cm" />
+            <zplane rmin="4.2*cm" rmax="4.4*cm"   z="-35.0*cm"/>
+            <zplane rmin="4.2*cm" rmax="4.4*cm" z="-25.0*cm"/>
+            <zplane rmin="1.8*cm" rmax="1.825*cm" z="-5.5*cm" />
+        </detector>           
+        <detector id="0" name="BeamPipeForward" type="PolyconeSupport" insideTrackingVolume="true">
+            <material name="Aluminum"/>        
+            <zplane rmin="1.8*cm" rmax="1.825*cm" z="5.5*cm" />
+            <zplane rmin="4.2*cm" rmax="4.4*cm" z="25.0*cm" />
+            <zplane rmin="4.2*cm" rmax="4.4*cm" z="35.0*cm" />
+            <zplane rmin="9.0*cm" rmax="9.2*cm" z="110.0*cm" />
+         </detector>
+    
         <!-- BeamPipe Liner -->
 <!--        
         <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
@@ -301,6 +309,12 @@
         </layer>
      </detector>
 -->
+
+
+<!-- TPC -->
+<!--
+
+-->
 <!-- Electromagnetic calorimeter -->
 
     <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
@@ -339,22 +353,19 @@
     </detector>
 
 <!-- Solenoid -->
-<!--
+
  <detector id="2" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
- <layer id="1" inner_r="250.0*cm" outer_z="271.0*cm">
-  <slice material="Steel235" thickness="6.0*cm" />
-  <slice material="Air" thickness="8.5*cm" />
+  <layer id="1" inner_r="375.*cm" outer_z="530.0*cm">
+   <slice material="Air" thickness="22.*cm" />
   </layer>
- <layer id="2" inner_r="264.5*cm" outer_z="262.5*cm">
-  <slice material="Aluminum" thickness="39.3*cm" />
-  <slice material="Steel235" thickness="6.0*cm" />
+  <layer id="2" inner_r="397.*cm" outer_z="430.*cm">
+   <slice material="Copper" thickness="5.5*cm" />
   </layer>
- <layer id="3" inner_r="309.8*cm" outer_z="271.0*cm">
-  <slice material="Air" thickness="20.0*cm" />
-  <slice material="Steel235" thickness="3.0*cm" />
+  <layer id="3" inner_r="402.5*cm" outer_z="530.*cm">
+   <slice material="Air" thickness="47.5*cm" />
   </layer>
   </detector>
--->
+
 <!--
  <detector id="4" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
  <layer id="1" inner_r="250.0*cm" inner_z="271.0*cm" outer_r="332.8*cm">
@@ -363,24 +374,34 @@
   </detector>
 -->
  <!--  Muon system  -->
- <!--
+ 
  <detector id="4" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits">
-  <dimensions inner_r="780.0*cm" outer_z="277.0*cm" />
- <layer repeat="4">
-  <slice material="Iron" thickness="5.0*cm" />
-  <slice material="Polystyrene" thickness="10.*cm" />
+  <dimensions inner_r="460.0*cm" outer_z="845.0*cm" />
+  <layer repeat="4">
+   <slice material="Iron" thickness="60.0*cm" />
+   <slice material="Polystyrene" thickness="10.*cm" />
   </layer>
+ </detector>
+
+
+ <detector id="8" name="MuonFrontEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">
+  <dimensions inner_r = "45.0*cm" inner_z = "430.*cm" outer_r = "360.0*cm" />
+ <layer repeat="2">
+  <slice material="Iron" thickness="42.5*cm" />
+  <slice material="Polystyrene" thickness="10.*cm" />
+    </layer>
   </detector>
 
 
+
  <detector id="8" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">
-  <dimensions inner_r = "45.0*cm" inner_z = "535.*cm" outer_r = "645.0*cm" />
+  <dimensions inner_r = "45.0*cm" inner_z = "535.*cm" outer_r = "455.5*cm" />
  <layer repeat="5">
-  <slice material="Iron" thickness="5.0*cm" />
+  <slice material="Iron" thickness="43.3*cm" />
   <slice material="Polystyrene" thickness="10.*cm" />
     </layer>
   </detector>
--->
+
 <!-- Forward Masks -->
 <!-- sensitive calorimeter same as EM end cap -->
 <!--
CVSspam 0.2.8