lcsim/src/org/lcsim/recon/tracking/seedtracker
diff -u -r1.6 -r1.7
--- MergeSeedLists.java 19 Aug 2009 22:12:27 -0000 1.6
+++ MergeSeedLists.java 1 Feb 2011 22:36:09 -0000 1.7
@@ -29,7 +29,7 @@
_diag = diagnostic;
}
- public void Merge(List<SeedCandidate> seedlist, SeedCandidate newseed, SeedStrategy strategy) {
+ public boolean Merge(List<SeedCandidate> seedlist, SeedCandidate newseed, SeedStrategy strategy) {
// if(diag!=null) diag.fireMergeStartDiagnostics(newseedlist);
// Assume the new seed is better than all duplicates
@@ -73,7 +73,7 @@
}
}
- return;
+ return best;
}
private boolean isDuplicate(SeedCandidate seed1, SeedCandidate seed2) {