diff -u -r1.2 -r1.3
--- TrackToClumpDOCA.java	26 Apr 2007 17:20:44 -0000	1.2
+++ TrackToClumpDOCA.java	19 Nov 2007 22:03:11 -0000	1.3
@@ -14,8 +14,15 @@

     public double evaluate(Cluster track, Cluster clump)
     {
 	Line line = MiscUtilities.makeLine(track);

-	Hep3Vector[] posAndDirOfClump = MiscUtilities.getPositionAndDirection(clump);
-	Hep3Vector positionClump = posAndDirOfClump[0];

+	Hep3Vector positionClump = null;
+	if (clump.getCalorimeterHits().size() >= 4) {
+	    // Compute "properly" from energy tensor
+	    Hep3Vector[] posAndDirOfClump = MiscUtilities.getPositionAndDirection(clump);
+	    positionClump = posAndDirOfClump[0];
+	} else {
+	    // Just grab the position
+	    positionClump = new BasicHep3Vector(clump.getPosition());
+	}

 	// Find the distance s ALONG the line to the POCA
 	double s = line.getDistanceToPoint(positionClump);
 	Hep3Vector poca = line.getPointAtDistance(s);