lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms
diff -u -r1.1 -r1.2
--- FindDotsAndBeads_Basic.java 30 Mar 2009 05:41:22 -0000 1.1
+++ FindDotsAndBeads_Basic.java 30 Mar 2009 05:49:22 -0000 1.2
@@ -25,7 +25,7 @@
* See methods javadoc for details on algorithms and implementations.
*
* @author D. Onoprienko
- * @version $Id: FindDotsAndBeads_Basic.java,v 1.1 2009/03/30 05:41:22 onoprien Exp $
+ * @version $Id: FindDotsAndBeads_Basic.java,v 1.2 2009/03/30 05:49:22 onoprien Exp $
*/
public class FindDotsAndBeads_Basic implements RosaryClusterer.FindDotsAndBeads {
@@ -71,7 +71,7 @@
*/
public void set(String name, Object... values) {
try {
- if (name.equalsIgnoreCase("N")) {
+ if (name.equalsIgnoreCase("CLUSTERER")) {
_layerClusterer = (Clusterer) values[0];
} else if (name.equalsIgnoreCase("DOT_SIZE_LIMIT")) {
_dotSizeLimit = (Integer) values[0];
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/drivers
diff -u -r1.1 -r1.2
--- CatClusterer.java 29 Mar 2009 23:44:24 -0000 1.1
+++ CatClusterer.java 30 Mar 2009 05:49:23 -0000 1.2
@@ -1,5 +1,7 @@
package org.lcsim.contrib.onoprien.crux.itc.drivers;
+import org.lcsim.recon.cluster.nn.NearestNeighborClusterer;
+
import org.lcsim.contrib.onoprien.crux.itc.RosaryClusterer;
import org.lcsim.contrib.onoprien.crux.itc.algorithms.*;
@@ -7,7 +9,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: CatClusterer.java,v 1.1 2009/03/29 23:44:24 onoprien Exp $
+ * @version $Id: CatClusterer.java,v 1.2 2009/03/30 05:49:23 onoprien Exp $
*/
public class CatClusterer extends RosaryClusterer {
@@ -19,6 +21,11 @@
public CatClusterer() {
+ FindDotsAndBeads_Basic findDotsAndBeads = new FindDotsAndBeads_Basic(this);
+ findDotsAndBeads.set("CLUSTERER", new NearestNeighborClusterer(1, 1, 0, 0, 0.));
+ findDotsAndBeads.set("DOT_SIZE_LIMIT", 1);
+ setFindDotsAndBeads(findDotsAndBeads);
+
ChooseSeedLayers_FirstN chooseSeedLayers = new ChooseSeedLayers_FirstN(this);
chooseSeedLayers.set("N", 0);
setChooseSeedLayers(chooseSeedLayers);