lcsim/src/org/lcsim/recon/cluster/density

diff -u -r1.1 -r1.2
--- Kinem.java	12 Aug 2005 19:59:49 -0000	1.1
+++ Kinem.java	7 Dec 2005 18:57:18 -0000	1.2
@@ -12,7 +12,7 @@

     public static double calcPhi(double[] pos){
         double phi = 0.0;
         phi = Math.atan2(pos[1],pos[0]);

-        if(phi<0.0) phi += Math.PI;

+        if(phi<0.0) phi += 2.0*Math.PI;

         return phi;
     }
 }

lcsim/src/org/lcsim/recon/cluster/density

diff -u -r1.3 -r1.4
--- LoadMyCalorimeterHit.java	29 Sep 2005 19:08:36 -0000	1.3
+++ LoadMyCalorimeterHit.java	7 Dec 2005 18:57:18 -0000	1.4
@@ -158,8 +158,13 @@

     // Get hit density from a hit reference
     double getDensity(final CalorimeterHit hit) {
 	if(hit==null) return 0.0;

+	return this.getDensity( hit.getCellID() );
+    }
+
+    // Get hit density from cellID
+    double getDensity(long cellid) {

 	try {

-	    return _densityMap.get( hit.getCellID() );

+	    return _densityMap.get( cellid );

 	}
 	catch(NullPointerException e) {
 	    // Hits below threshold end up here, should return density=0

@@ -167,12 +172,6 @@

 	}
     }
 

-    // Get hit density from cellID
-    double getDensity(long cellid) {
-	if(cellid==0) return 0.0;
-	return _densityMap.get( cellid );
-    }
-

     //*** FIELDS ***
 
     private static LoadMyCalorimeterHit _me = null;