diff -u -r1.1 -r1.2
--- SubdetectorLocator.java	2 Aug 2005 17:18:05 -0000	1.1
+++ SubdetectorLocator.java	7 Feb 2006 17:54:49 -0000	1.2
@@ -19,8 +19,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 d.getIDDecoder().getSubdetector();

    }
 }

\ No newline at end of file