lcsim/src/org/lcsim/recon/cluster/cheat
diff -u -r1.2 -r1.3
--- PerfectClusterer.java 4 Jul 2006 23:47:54 -0000 1.2
+++ PerfectClusterer.java 18 Jul 2006 00:48:24 -0000 1.3
@@ -14,7 +14,7 @@
/**
* A clusterer with perfect pattern recognition
*
- * @version $Id: PerfectClusterer.java,v 1.2 2006/07/04 23:47:54 mcharles Exp $
+ * @version $Id: PerfectClusterer.java,v 1.3 2006/07/18 00:48:24 mcharles Exp $
*/
public class PerfectClusterer extends Driver
@@ -33,7 +33,7 @@
* Optionally, clusters may share a hit if more than one
* particle contributed to it.
*
- * @version $Id: PerfectClusterer.java,v 1.2 2006/07/04 23:47:54 mcharles Exp $
+ * @version $Id: PerfectClusterer.java,v 1.3 2006/07/18 00:48:24 mcharles Exp $
*/
public void process(EventHeader event)
{
@@ -66,13 +66,17 @@
truthParticles.add(biggestContributor);
}
for (MCParticle part : truthParticles) {
- BasicCluster clus = particleToClusterMap.get(part);
- if (clus == null) {
- // Haven't yet made a cluster for this particle -- make one now
- clus = new BasicCluster();
- particleToClusterMap.put(part, clus);
+ if (part != null) {
+ BasicCluster clus = particleToClusterMap.get(part);
+ if (clus == null) {
+ // Haven't yet made a cluster for this particle -- make one now
+ clus = new BasicCluster();
+ particleToClusterMap.put(part, clus);
+ }
+ clus.addHit(hit);
+ } else {
+ // Null particle => No truth match for this hit => ignore it
}
- clus.addHit(hit);
}
}