diff -u -r1.6 -r1.7
--- compact.xml	29 Apr 2010 13:53:05 -0000	1.6
+++ compact.xml	4 May 2010 22:44:42 -0000	1.7
@@ -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.6 2010/04/29 13:53:05 cassell Exp $">

+        version="$Id: compact.xml,v 1.7 2010/05/04 22:44:42 ngraf Exp $">

         <comment>The compact format for the Silicon Detector as described in the LOI 090204.  Includes global XY segmentation in cal endcaps.  -JM</comment>        
     </info>
     <define>

@@ -561,7 +561,7 @@

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

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

+        <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">

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

@@ -586,7 +586,7 @@

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

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

+        <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">

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

@@ -1126,7 +1126,7 @@

             <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:24</id>
         </readout>
         <readout name="EcalBarrelHits">

-            <segmentation type="EcalBarrelCartesianGridXY" gridSizeX="3.5" gridSizeY="3.5" />

+            <segmentation type="CartesianGridXY" gridSizeX="3.5" gridSizeY="3.5" />

             <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
         </readout>        
         <readout name="EcalEndcapHits">

@@ -1134,7 +1134,7 @@

             <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
         </readout>
         <readout name="HcalBarrelHits">

-            <segmentation type="RegularNgonCartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />

+            <segmentation type="CartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />

             <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
         </readout>
         <readout name="HcalEndcapHits">

@@ -1142,7 +1142,7 @@

             <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
         </readout>
         <readout name="MuonBarrelHits">

-            <segmentation type="RegularNgonCartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />

+            <segmentation type="CartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />

             <id>system:8,barrel:3,module:4,layer:8,slice:4,x:32:-16,y:-16</id>
         </readout>
         <readout name="MuonEndcapHits">