diff -u -r1.1 -r1.2
--- compact.xml	6 Nov 2009 22:16:31 -0000	1.1
+++ compact.xml	19 Nov 2009 18:17:07 -0000	1.2
@@ -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.1 2009/11/06 22:16:31 jeremy Exp $">

+        version="$Id: compact.xml,v 1.2 2009/11/19 18:17:07 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>

@@ -541,7 +541,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="PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits">

             <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.16*cm" />
             </layer>
         </detector>

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

+        <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits">

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

@@ -616,7 +616,7 @@

             </layer>
         </detector>
         

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

+        <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true">

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