Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/recon/ecal on MAIN
HPSEcal1BitClusterer.java+4-11.3 -> 1.4
Fixed another bug; 1-bit clusterer now appears to work

hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcal1BitClusterer.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- HPSEcal1BitClusterer.java	18 Aug 2011 22:50:54 -0000	1.3
+++ HPSEcal1BitClusterer.java	19 Aug 2011 00:00:57 -0000	1.4
@@ -143,7 +143,7 @@
                 if (hitCount == null)
                     hitCounts.put(hit.getCellID(), 1);
                 else
-                    hitCount++;
+                    hitCounts.put(hit.getCellID(), hitCount+1);
             }
         }
 
@@ -151,6 +151,7 @@
         Iterator<Long> possibleClusters = hitCounts.keySet().iterator();
         while (possibleClusters.hasNext()) {
             Long possibleCluster = possibleClusters.next();
+            //System.out.printf("%d, %d hits\n",possibleCluster,hitCounts.get(possibleCluster));
             if (hitCounts.get(possibleCluster) <= clusterThreshold) {
                 continue;
             }
@@ -171,6 +172,7 @@
             int side1 = dec.getValue("side");
             Integer hitCount = hitCounts.get(possibleCluster);
 
+            //System.out.printf("Possible cluster: x: %d, y: %d, side:%d, hits: %d\n",x1,y1,side1,hitCount);
             boolean isCluster = true;
             for (Long neighborId : neighbors) {
                 // Set the ID.
@@ -291,6 +293,7 @@
             }
 
             if (isCluster) {
+                //System.out.printf("Cluster: x: %d, y: %d, side:%d, hits: %d\n",x1,y1,side1,hitCount);
                 BasicCluster cluster = new BasicCluster();
                 cluster.addHit(hitMap.get(possibleCluster));
                 for (Long neighborId : neighbors) {
CVSspam 0.2.8