diff -u -r1.7 -r1.8
--- compact.xml	27 Sep 2009 22:56:40 -0000	1.7
+++ compact.xml	25 Jan 2010 21:20:35 -0000	1.8
@@ -6,7 +6,7 @@

         author="Norman Graf, Jeremy McCormick"
         url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
         status="development"

-        version="$Id: compact.xml,v 1.7 2009/09/27 22:56:40 partridge Exp $">

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

         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>

@@ -527,7 +527,7 @@

         </detector>
         <comment>Calorimeters</comment>
 

-        <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis">

+        <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">

             <comment>EM Calorimeter Barrel</comment>
             <dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
             <staves vis="EcalBarrelStaveVis"/>

@@ -554,7 +554,7 @@

                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>

-        <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis">

+        <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">

             <comment>EM Calorimeter Endcaps</comment>
             <dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="200.0" rmax="1264.5" />
             <layer repeat="1">

@@ -580,7 +580,7 @@

                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>

-        <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis">

+        <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL">

             <comment>Hadron Calorimeter Barrel</comment>
             <dimensions numsides="12" rmin="1419.0" z="3018.0 * 2"/>
             <staves vis="HcalBarrelStavesVis"/>

@@ -593,7 +593,7 @@

                 <slice material = "Air" thickness = "0.16*cm" />
             </layer>
         </detector>

-        <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter" readout="HcalEndcapHits" vis="HcalEndcapVis">

+        <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP">

             <comment>Hadron Calorimeter Endcaps</comment>
             <dimensions numsides="12" zmin="1805.0" rmin="200.0" rmax="1469.0" />
             <layer repeat="45">

@@ -606,7 +606,7 @@

             </layer>
         </detector>
 

-        <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits" vis="MuonBarrelVis">

+        <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL">

             <comment>Muon Calorimeter Barrel</comment>
             <dimensions numsides="8" rmin="3464.0" z="3018.0 * 2"/>
             <staves vis="MuonBarrelStavesVis"/>

@@ -630,7 +630,7 @@

             </layer>
         </detector>
         

-        <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis">

+        <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">

             <comment>Muon Calorimeter Endcaps</comment>
             <dimensions numsides="8" zmin="3028.0" rmin="200.0" rmax="6082.0" />
             <layer repeat="11" vis="MuonEndcapLayerVis">

@@ -653,7 +653,7 @@

             </layer>
         </detector>
         

-        <detector id="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis">

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

             <comment>Luminosity Calorimeter</comment>
             <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
             <layer repeat="20" >

@@ -672,7 +672,7 @@

             </layer>
         </detector>
         

-        <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits" vis="BeamCalVis">

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

             <comment>Beam Calorimeter</comment>
             <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" />