lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.21 -r1.22
--- ZvTop.java 15 Sep 2005 00:34:00 -0000 1.21
+++ ZvTop.java 25 Oct 2005 17:55:00 -0000 1.22
@@ -160,8 +160,8 @@
minOverlap = overlap1;
if (overlap2 < minOverlap)
minOverlap = overlap2;
- System.out.println("Value: " + minOverlap
- / ((overlap2 < overlap1) ? overlap2 : overlap1));
+// System.out.println("Value: " + minOverlap
+// / ((overlap2 < overlap1) ? overlap2 : overlap1));
return minOverlap / ((overlap2 < overlap1) ? overlap2 : overlap1) < resolvedCut;
}
@@ -171,7 +171,7 @@
* to a set of resolved/unresolved ZvMaxima
*/
private void assignResolution() {
- System.out.println("assignResolution:");
+// System.out.println("assignResolution:");
final Set<ZvMaximum> maxSet = maximumMatrix.getMaxima();
for (ZvMaximum iMax : maxSet) {
Set<ZvMaximum> isResolvedFromImax = new HashSet<ZvMaximum>();
@@ -179,29 +179,29 @@
for (ZvMaximum jMax : maxSet) {
if (iMax == jMax)
continue;
- System.out.printf("%s and %s ", iMax, jMax);
+// System.out.printf("%s and %s ", iMax, jMax);
if (areResolved(iMax.getLocation(), jMax.getLocation())) {
isResolvedFromImax.add(jMax);
- System.out.println("are resolved");
+// System.out.println("are resolved");
} else {
isNotResolvedFromImax.add(jMax);
- System.out.println("are not resolved");
+// System.out.println("are not resolved");
}
}
isResolvedFromMap.put(iMax, isResolvedFromImax);
unresolvedMaximaMap.put(iMax, isNotResolvedFromImax);
}
- System.out.printf("isResolvedFromMap: %d\tunresolvedMaximaMap: %d\n",
- isResolvedFromMap.size(), unresolvedMaximaMap.size());
- System.out.println("ZvMaxima");
+// 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);
- System.out.printf("Is resolved from %d other Maxima\n",
- isResolvedFromMap.get(iMax).size());
- System.out.printf("Is unresolved from %d other Maxima\n",
- unresolvedMaximaMap.get(iMax).size());
+// System.out.println(iMax);
+// System.out.printf("Is resolved from %d other Maxima\n",
+// isResolvedFromMap.get(iMax).size());
+// System.out.printf("Is unresolved from %d other Maxima\n",
+// unresolvedMaximaMap.get(iMax).size());
}
- System.out.println("done assignResolution");
+// System.out.println("done assignResolution");
}
/**
@@ -211,7 +211,7 @@
* candidate.
*/
private void clusterCandidates() {
- System.err.println("entering clusterCandidates");
+// System.err.println("entering clusterCandidates");
SortedSet<ZvMaximum> isAvailable = new TreeSet<ZvMaximum>(maximumMatrix
.getMaxima());
// each cluster consists of several ZvMaxima
@@ -228,8 +228,8 @@
_vertexCandidateList.add(vtx);
isAvailable.removeAll(unresolvedSet);
}
- System.err.printf("done clusterCandidates: %d Candidates",
- _vertexCandidateList.size());
+// System.err.printf("done clusterCandidates: %d Candidates",
+// _vertexCandidateList.size());
return;
}
@@ -240,7 +240,7 @@
// TODO maybe the maxima don't even have to be transformed
// TODO the sequence of for-loops is a little clumsy
private void findGlobalMaxima() {
- System.out.println("Entering findGlobalMaxima");
+// System.out.println("Entering findGlobalMaxima");
// search in micrometer steps in xy
final double xyStep = 0.001;
// search in 10 micrometer steps in z
@@ -349,7 +349,7 @@
// search in x,y,z is done. set to found maximum
iMax.setLocation(maxPoint);
}
- System.out.println("Global Maxima done");
+// System.out.println("Global Maxima done");
}
/**
@@ -359,8 +359,8 @@
*/
public List<ZvVertex> findVertices(List<Track> list) {
trackList.clear();
- System.err
- .printf("entering findVertives with %d Tracks\n", list.size());
+// System.err
+// .printf("entering findVertives with %d Tracks\n", list.size());
// FIXME Put in IP as constraint. At the moment, no vertex contains IP
for (Track iTrack : list) {
trackList.add(new ZvTrack(iTrack));
@@ -379,11 +379,11 @@
maximumMatrix.add(max, i, j);
}
}
- System.out.println("maximumMatrix: " + maximumMatrix._table.size());
+// System.out.println("maximumMatrix: " + maximumMatrix._table.size());
findGlobalMaxima();
assignResolution();
clusterCandidates();
- System.err.println("done findVertices\n");
+// System.err.println("done findVertices\n");
return fitVertices();
}
@@ -397,9 +397,9 @@
private List<ZvVertex> fitVertices() {
List<ZvVertex> l = new ArrayList<ZvVertex>();
Set<ZvTrack> unavailableTracks = new HashSet<ZvTrack>();
- System.err.printf("found %d Candidates\n", _vertexCandidateList.size());
+// System.err.printf("found %d Candidates\n", _vertexCandidateList.size());
for (ZvVertex iCand : _vertexCandidateList) {
- System.err.printf(iCand.toString());
+// System.err.printf(iCand.toString());
}
// The Maxima are clustered according to the resolution function
// A Cluster is a Set of ZvMaxima
@@ -407,7 +407,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);
+// System.out.println("using chi2 cut of " + chiSquareCut);
iVtx.setChi2(chiSquareCut);
for (ZvTrack t : unavailableTracks) {
iVtx.removeTrack(t);
@@ -417,7 +417,7 @@
// the chi2 cut, so that at any time only good tracks are in the
// vertex
if (!iVtx.getFitStatus().isOK()) {
- System.err.printf("FitStatus is: %s\n", status);
+// System.err.printf("FitStatus is: %s\n", status);
}
l.add(iVtx);
unavailableTracks.addAll(iVtx.getVtxTracks());