diff -u -r1.10 -r1.11
--- compact.xml	15 Jul 2005 22:27:05 -0000	1.10
+++ compact.xml	2 Aug 2005 17:09:55 -0000	1.11
@@ -128,7 +128,7 @@

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

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

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

         <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
         <layer repeat="30" >
           <slice material = "Tungsten" thickness = "0.25*cm" />

@@ -145,28 +145,28 @@

            <slice material = "Polystyrene" thickness = "1.0*cm" sensitive = "yes" />
          </layer>
     </detector>

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

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

         <dimensions inner_r = "20.0*cm" inner_z = "184.0*cm" outer_r = "142.0*cm" />
         <layer repeat="34" >
            <slice material = "Steel235" thickness = "2.0*cm" />
            <slice material = "Polystyrene" thickness = "1.0*cm" sensitive = "yes" />
         </layer>
     </detector>

-    <detector id="4" name="MUON_BARREL" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter">

+    <detector id="4" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter">

          <dimensions inner_r = "337.0*cm" outer_z = "287.0*cm" />
          <layer repeat="32">
            <slice material = "Iron" thickness = "5.0*cm" />
            <slice material = "Air" thickness = "1.5*cm" sensitive = "yes" />
          </layer>
     </detector>

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

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

          <dimensions inner_r = "20.0*cm" inner_z = "287.0*cm" outer_r = "636.0*cm" />
          <layer repeat="32">
            <slice material = "Iron" thickness = "5.0*cm" />
            <slice material = "Air" thickness = "1.5*cm" sensitive = "yes" />
          </layer>
     </detector>

-    <detector id="9" name="LUM_ENDCAP" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumEndcapHits">

+    <detector id="9" name="LumEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumEndcapHits">

         <dimensions inner_r = "0.0001*cm" inner_z = "310.0*cm" outer_r = "9.2*cm" />
         <layer repeat="1">
           <slice material="Beryllium" thickness = "10.*cm" />

diff -N SamplingFractions.properties
--- SamplingFractions.properties	6 Jul 2005 00:13:51 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@

-# Calorimeter Sampling fractions     
-
-sfEMB: .021805
-sfEME: .017703
-sfHB: .06338
-sfHE: .06338
-sfMB: .000057
-sfME: .000057
-sfLE: .0240
-angEMB: .078
-angEME: .078

diff -N EMBarrel.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ EMBarrel.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .021805

\ No newline at end of file

diff -N EMEndcap.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ EMEndcap.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .017703

\ No newline at end of file

diff -N HADBarrel.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ HADBarrel.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .06338

\ No newline at end of file

diff -N HADEndcap.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ HADEndcap.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .06338

\ No newline at end of file

diff -N LumEndcap.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ LumEndcap.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .0240

\ No newline at end of file

diff -N MuonBarrel.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MuonBarrel.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .000057

\ No newline at end of file

diff -N MuonEndcap.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MuonEndcap.properties	2 Aug 2005 17:09:55 -0000	1.1
@@ -0,0 +1 @@

+samplingFraction: .000057

\ No newline at end of file