lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.18 -r1.19
--- ZvTop.java 10 Sep 2005 01:10:26 -0000 1.18
+++ ZvTop.java 12 Sep 2005 17:21:22 -0000 1.19
@@ -175,6 +175,10 @@
maximumMatrix.add(max, i, j);
}
}
+ System.out.println("maximumMatrix: " + maximumMatrix._table.size());
+ for (ZvMaximum iMax : maximumMatrix._table.keySet()) {
+ System.out.println(iMax);
+ }
assignResolution();
findGlobalMaxima();
clusterCandidates();
@@ -234,6 +238,7 @@
Hep3Vector vec = subtract(sp2, sp1);
Hep3Vector toSp1 = new BasicHep3Vector(sp1.x(), sp1.y(), sp1.z());
for (int i = 1; i < iterationMax; ++i) {
+ // TODO fix the casts
Hep3Vector rVec = add(toSp1, multiply(vec, i / iterationMax));
SpacePoint r = new CartesianPoint(rVec.x(), rVec.y(), rVec.z());
double overlap = overlap(r);
@@ -272,9 +277,15 @@
unresolvedMaximaMap.put(iMax, isNotResolvedFromImax);
}
System.out.println("assignResolution:");
- System.out.println("\tZvMaxima");
- for (ZvMaximum iMax : isResolvedFromMap.keySet()) {
+ System.out.printf("isResolvedFromMap: %d\tunresolvedMaximaMap: %d", isResolvedFromMap.size(), unresolvedMaximaMap.size());
+ System.out.println("ZvMaxima");
+ for (ZvMaximum iMax : unresolvedMaximaMap.keySet()) {
System.out.println(iMax);
+ System.out.printf("Is resolved from %d other Maxima\n", isResolvedFromMap.get(iMax).size());
+ System.out.printf("List of unresolved Maxima (%d):", unresolvedMaximaMap.get(iMax).size());
+ for (ZvMaximum iUnresolvedMax : unresolvedMaximaMap.get(iMax)) {
+ System.out.println(iUnresolvedMax);
+ }
}
System.out.println("");
}
@@ -397,6 +408,7 @@
*/
private void clusterCandidates() {
System.err.println("entering clusterCandidates");
+ System.out.println(maximumMatrix.getMaxima());
SortedSet<ZvMaximum> isAvailable = new TreeSet<ZvMaximum>(maximumMatrix.getMaxima());
// each cluster consists of several ZvMaxima
// add the maximum and the set of unresolved maxima to the list of
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.4 -r1.5
--- ZvMaximum.java 10 Sep 2005 01:10:26 -0000 1.4
+++ ZvMaximum.java 12 Sep 2005 17:21:22 -0000 1.5
@@ -64,7 +64,7 @@
}
public String toString() {
- String s = String.format("value: %.3f\nlocation: %s\n", _value, _location);
+ String s = String.format("value: %f\nlocation: %s\n", _value, _location);
return s;
}
}
