diff -u -r1.1 -r1.1.2.1
--- SubdetectorLocator.java	2 Aug 2005 17:18:05 -0000	1.1
+++ SubdetectorLocator.java	28 Sep 2005 18:02:27 -0000	1.1.2.1
@@ -3,6 +3,7 @@

 import org.lcsim.event.EventHeader.LCMetaData;
 import org.lcsim.geometry.CalorimeterIDDecoder;
 import org.lcsim.geometry.Subdetector;

+import org.lcsim.geometry.SubdetectorIDDecoder;

 
 /**
  * This class enables us to find the subdector and sampling fraction from

@@ -19,8 +20,6 @@

 {
    static Subdetector locateSubdetector(LCMetaData d, long id)
    {

-      // Fixme: We should not assume this is a calorimeter hit
-      // Fixme: This method getCalorimeter should not exist on CalorimeterIDDecoder
-      return ((CalorimeterIDDecoder) d.getIDDecoder()).getCalorimeter();

+      return ((SubdetectorIDDecoder) d.getIDDecoder()).getSubdetector();

    }
 }

\ No newline at end of file