4 modified files
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.13 -r1.14
--- ZvUtil.java 7 Sep 2005 01:09:59 -0000 1.13
+++ ZvUtil.java 13 Sep 2005 09:32:51 -0000 1.14
@@ -50,12 +50,12 @@
}
private static SpacePoint parabolaPocaTwoTrackMax(ZvTrack iTrack, ZvTrack jTrack) {
- SpacePoint maxLocation = new SpacePoint();
+ SpacePoint maxLocation = null;
// limit the region where to look to the vertex detector.
final double maxRad = 50;
final double maxZ = 150;
final int maxStep = 15;
- double maxOverlap = 0;
+ double maxOverlap = -1;
// cut the Track into maxStep steps and calculate the distance
// to the other parabola
for (int s=1; s <= maxStep; ++s) {
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.19 -r1.20
--- ZvTrack.java 12 Aug 2005 03:09:05 -0000 1.19
+++ ZvTrack.java 13 Sep 2005 09:32:51 -0000 1.20
@@ -356,6 +356,8 @@
* @return the scalar value at that location
*/
public double getTubeValue(SpacePoint location) {
+ // TODO for debugging only
+ assert(location != null);
SpacePoint r = rotateLocation(location);
SpacePoint refPrime = rotateLocation(_referencePoint);
double termA = (r.x() - refPrime.x() - _parameters.get(ZvParameterNames.kappa) * r.y()
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.19 -r1.20
--- ZvTop.java 12 Sep 2005 17:21:22 -0000 1.19
+++ ZvTop.java 13 Sep 2005 09:32:51 -0000 1.20
@@ -277,7 +277,7 @@
unresolvedMaximaMap.put(iMax, isNotResolvedFromImax);
}
System.out.println("assignResolution:");
- System.out.printf("isResolvedFromMap: %d\tunresolvedMaximaMap: %d", isResolvedFromMap.size(), unresolvedMaximaMap.size());
+ System.out.printf("isResolvedFromMap: %d\tunresolvedMaximaMap: %d\n", isResolvedFromMap.size(), unresolvedMaximaMap.size());
System.out.println("ZvMaxima");
for (ZvMaximum iMax : unresolvedMaximaMap.keySet()) {
System.out.println(iMax);
@@ -422,7 +422,7 @@
_vertexCandidateList.add(vtx);
isAvailable.removeAll(unresolvedSet);
}
- System.err.println("done clusterCandidates");
+ System.err.printf("done clusterCandidates: %d Candidates", _vertexCandidateList.size());
return;
}
@@ -447,6 +447,7 @@
// The vertex decides based on the chiSquared value
// which of those tracks it wants to keep
for (ZvVertex iVtx : _vertexCandidateList) {
+ System.out.println("using chi2 cut of " + chiSquareCut);
iVtx.setChi2(chiSquareCut);
for (ZvTrack t : unavailableTracks) {
iVtx.removeTrack(t);
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.5 -r1.6
--- ZvMaximum.java 12 Sep 2005 17:21:22 -0000 1.5
+++ ZvMaximum.java 13 Sep 2005 09:32:51 -0000 1.6
@@ -3,10 +3,9 @@
*/
package org.lcsim.recon.vertexing.zvtop4;
+import org.lcsim.spacegeom.Representation;
import org.lcsim.spacegeom.SpacePoint;
-
-
/**
* Maximum in the overlap of two tracks
* @author jstrube
@@ -22,6 +21,7 @@
_track_i = track_i;
_track_j = track_j;
_location = loc;
+ // TODO for debugging only
_value = overlap;
}
CVSspam 0.2.8