LCDetectors/detectors/sid02

diff -u -r1.21 -r1.22
--- compact.xml	29 Aug 2008 22:00:18 -0000	1.21
+++ compact.xml	25 Jan 2010 21:20:03 -0000	1.22
@@ -8,7 +8,7 @@

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

-        version="$Id: compact.xml,v 1.21 2008/08/29 22:00:18 ngraf Exp $">

+        version="$Id: compact.xml,v 1.22 2010/01/25 21:20:03 cassell Exp $">

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

@@ -631,7 +631,7 @@

 
         <!-- Electromagnetic calorimeter -->
 

-        <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">

+        <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits" calorimeterType="EM_BARREL">

             <dimensions inner_r = "127.0*cm" outer_z = "182.0*cm" />
             <layer repeat="1">
                 <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />

@@ -655,7 +655,7 @@

             </layer>
         </detector>
 

-        <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">

+        <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits" calorimeterType="EM_ENDCAP">

             <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
             <layer repeat="1">
                 <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />

@@ -681,7 +681,7 @@

 
         <!-- Hadronic calorimeter -->
 

-        <detector id="3" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">

+        <detector id="3" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits" calorimeterType="HAD_BARREL">

             <dimensions inner_r = "141.0*cm" outer_z = "294*cm" />
             <layer repeat="40">
                 <slice material = "Steel235" thickness = "2.0*cm" />

@@ -693,7 +693,7 @@

             </layer>
         </detector>
 

-        <detector id="7" name="HADEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits">

+        <detector id="7" name="HADEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits" calorimeterType="HAD_ENDCAP">

             <dimensions inner_r = "20.0*cm" inner_z = "182.0*cm" outer_r = "140.75*cm" />
             <layer repeat="40" >
                 <slice material = "Steel235" thickness = "2.0*cm" />

@@ -729,7 +729,7 @@

 
 
         <!--  Muon system  -->

-        <detector id="4" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits">

+        <detector id="4" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" calorimeterType="MUON_BARREL">

             <dimensions inner_r="SolenoidBarrelOuterRadius+MuonBarrelStayClear" outer_z="MuonBarrelOuterZ" />
             <layer repeat="11">
                 <slice material="Aluminum" thickness="0.1*cm" />

@@ -751,7 +751,7 @@

             </layer>
         </detector>
 

-        <detector id="8" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">

+        <detector id="8" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits" calorimeterType="MUON_ENDCAP">

             <dimensions inner_r = "20.0*cm" inner_z = "303.3*cm" outer_r = "608.2*cm" />
             <layer repeat="11">
                 <slice material="Iron" thickness="20.0*cm" />

@@ -776,7 +776,7 @@

         <!-- Forward Masks -->
         <!-- sensitive calorimeter same as EM end cap -->
 

-        <detector id="9" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits">

+        <detector id="9" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits" calorimeterType="LUMI">

             <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
             <layer repeat="20" >
                 <slice material = "TungstenDens24" thickness = "0.271*cm" />

@@ -830,7 +830,7 @@

 
         <!-- Instrumented luminosity monitor -->
 

-        <detector id="10" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits">

+        <detector id="10" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits" calorimeterType="BEAM">

             <dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
             <beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
             <layer repeat="50">