diff -u -r1.16 -r1.17
--- HitPositionTest.java	22 May 2006 19:55:07 -0000	1.16
+++ HitPositionTest.java	21 Jun 2006 18:10:18 -0000	1.17
@@ -4,7 +4,7 @@

 
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.SimCalorimeterHit;

-import org.lcsim.geometry.CalorimeterIDDecoder;

+import org.lcsim.geometry.IDDecoder;

 import org.lcsim.geometry.Subdetector;
 import org.lcsim.geometry.util.BaseIDDecoder;
 import org.lcsim.util.Driver;

@@ -103,7 +103,7 @@

             for (String s : colls)
             {
                 List<SimCalorimeterHit> hits = event.get(SimCalorimeterHit.class, s);

-                CalorimeterIDDecoder decoder = (CalorimeterIDDecoder) event.getMetaData(hits).getIDDecoder();

+                IDDecoder decoder = event.getMetaData(hits).getIDDecoder();

 
                 if (decoder == null)
                 {

@@ -153,4 +153,4 @@

             }
         }
     }

-}

\ No newline at end of file

+}

diff -u -r1.1 -r1.2
--- ReadoutTest.java	26 Jul 2005 14:46:01 -0000	1.1
+++ ReadoutTest.java	21 Jun 2006 18:10:18 -0000	1.2
@@ -52,7 +52,7 @@

          for (List<SimCalorimeterHit> collection : collections)
          {
             LCMetaData meta = event.getMetaData(collection);

-            List copy = new ArrayList(collection);

+            List<SimCalorimeterHit> copy = new ArrayList<SimCalorimeterHit>(collection);

             event.put(meta.getName()+"Copy",copy,SimCalorimeterHit.class,meta.getFlags(),meta.getName());
          }
          collections = event.get(SimCalorimeterHit.class);