diff -u -r1.3 -r1.4
--- PolyhedraBarrelCalorimeterTest.java	16 May 2007 23:27:38 -0000	1.3
+++ PolyhedraBarrelCalorimeterTest.java	14 Sep 2007 23:48:58 -0000	1.4
@@ -31,11 +31,11 @@

         GeometryReader reader = new GeometryReader();
         det = reader.read(in);
         

-        assertTrue( det.getSubdetectors().get("PolyhedraBarrelCalorimeterTest") != null );

+        assertTrue( det.getSubdetectors().get("PolyhedraBarrelCalorimeterSubdet") != null );

         
         try
         {

-            pbc = (PolyhedraBarrelCalorimeter) det.getSubdetectors().get("PolyhedraBarrelCalorimeterTest");

+            pbc = (PolyhedraBarrelCalorimeter) det.getSubdetectors().get("PolyhedraBarrelCalorimeterSubdet");

         }
         catch ( ClassCastException cce )
         {

diff -u -r1.1 -r1.2
--- PolyhedraBarrelCalorimeterTest.xml	12 Sep 2007 18:24:32 -0000	1.1
+++ PolyhedraBarrelCalorimeterTest.xml	14 Sep 2007 23:48:59 -0000	1.2
@@ -26,7 +26,7 @@

 
   <detectors>
     <detector id="1"

-              name="PolyhedraBarrelCalorimeterTest"

+              name="PolyhedraBarrelCalorimeterSubdet"

               type="PolyhedraBarrelCalorimeter"
               readout="CalHits">
          <dimensions numsides="8" z="1000.0" rmin="500.0"/>

@@ -40,15 +40,10 @@

   <readouts>
     <readout name="CalHits">
       <segmentation type="GridXYZ" gridSizeX="1.0" gridSizeY="1.0" />

-      <id>layer:8,system:6,barrel:3,x:32:-10,y:-10</id>

+      <id>system:6,barrel:3,stave:5,layer:8,x:32:-10,y:-10</id>

     </readout>
   </readouts>
 
   <fields>

-    <field type="Solenoid" name="GlobalSolenoid"
-              inner_field="5.0"
-              outer_field="-0.6"
-              zmax="1000"
-              outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Oxygen gap + half coil-->
-   </fields>

+  </fields>

 </lccdd>