diff -u -r1.7 -r1.8
--- compact.xml	29 Nov 2006 02:10:43 -0000	1.7
+++ compact.xml	25 Jan 2010 21:19:36 -0000	1.8
@@ -8,7 +8,7 @@

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

-	version="$Id: compact.xml,v 1.7 2006/11/29 02:10:43 partridge Exp $">

+	version="$Id: compact.xml,v 1.8 2010/01/25 21:19:36 cassell Exp $">

     <comment>The compact format for the Silicon Detector v01 060901</comment>
   </info>
 

@@ -626,7 +626,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" />

@@ -650,7 +650,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 = "26.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
       <layer repeat="1">
 	<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />

@@ -676,7 +676,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 = "277.2*cm" />
       <layer repeat="34">
 	<slice material = "Steel235" thickness = "2.0*cm" />

@@ -688,7 +688,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 = "26.0*cm" inner_z = "182.0*cm" outer_r = "140.75*cm" />
       <layer repeat="34" >
 	<slice material = "Steel235" thickness = "2.0*cm" />

@@ -724,7 +724,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="333.0*cm" outer_z="277.0*cm" />
       <layer repeat="48">
 	<slice material="Iron" thickness="5.0*cm" />

@@ -736,7 +736,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 = "26.0*cm" inner_z = "277.5*cm" outer_r = "645.0*cm" />
       <layer repeat="48">
 	<slice material="Iron" thickness="5.0*cm" />

@@ -752,7 +752,7 @@

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

-    <detector id="9" name="ForwardEMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="ForwardEcalEndcapHits">

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

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

@@ -813,7 +813,7 @@

 
     <!-- Instrumented luminosity monitor -->
 

-    <detector id="10" name="ForwardLuminosityMonitor" reflect="true" type="CylindricalEndcapCalorimeter" readout="LuminosityMonitorHits">

+    <detector id="10" name="ForwardLuminosityMonitor" reflect="true" type="CylindricalEndcapCalorimeter" readout="LuminosityMonitorHits" calorimeterType="BEAM">

       <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" />