lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.6 -r1.7
--- CalHitMapMgr.java	27 Dec 2005 17:16:29 -0000	1.6
+++ CalHitMapMgr.java	9 Feb 2006 21:16:18 -0000	1.7
@@ -9,6 +9,7 @@

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.IDDecoder;

+import org.lcsim.geometry.util.BaseIDDecoder;

 import org.lcsim.geometry.compact.Subdetector;
 import org.lcsim.geometry.compact.Readout;
 

@@ -18,12 +19,12 @@

  * accessed from *any* class, using e.g.<p>
  *
  *   <code>Map&lt;Long,CalorimeterHit&gt; hitmap = CalHitMapMgr.getInstance().getCollHitMap("EcalBarrHits");</code>

- * 

+ *

  * <p><em>Note:</em> <code>CalHitMapDriver</code> needs to be
  * processed before the data is available to other classes.
  *
  * @author Guilherme Lima

- * @version $Id: CalHitMapMgr.java,v 1.6 2005/12/27 17:16:29 lima Exp $

+ * @version $Id: CalHitMapMgr.java,v 1.7 2006/02/09 21:16:18 lima Exp $

  * @see CalHitMapDriver
  */
 public class CalHitMapMgr {

@@ -76,9 +77,9 @@

 	return _subdets.get(readout);
     }
 

-    public IDDecoder getIDDecoder(String colName) {

+    public BaseIDDecoder getIDDecoder(String colName) {

 	List<CalorimeterHit> coll = _event.get(CalorimeterHit.class,colName);

-	return _event.getMetaData( coll ).getIDDecoder();

+	return (BaseIDDecoder)_event.getMetaData( coll ).getIDDecoder();

     }
 
     /**

lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.1 -r1.2
--- CalorimeterHitESort.java	25 Aug 2005 23:06:06 -0000	1.1
+++ CalorimeterHitESort.java	9 Feb 2006 21:16:18 -0000	1.2
@@ -9,14 +9,12 @@

  * Usage:   Collection.sort( aHitCollection, new CalorimeterHitESort() );
  *
  * @author Guilherme Lima

- * @version $Id: CalorimeterHitESort.java,v 1.1 2005/08/25 23:06:06 lima Exp $

+ * @version $Id: CalorimeterHitESort.java,v 1.2 2006/02/09 21:16:18 lima Exp $

  */

-public class CalorimeterHitESort implements Comparator

+public class CalorimeterHitESort implements Comparator<CalorimeterHit>

 {

-    public int compare(Object obj1, Object obj2)

+    public int compare(CalorimeterHit x1, CalorimeterHit x2)

     {

-        CalorimeterHit x1 = (CalorimeterHit) obj1;
-        CalorimeterHit x2 = (CalorimeterHit) obj2;

         if( x1.getRawEnergy() - x2.getRawEnergy() > 0 ) return -1;
         return 1;
     }