lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms

diff -u -r1.2 -r1.3
--- FindDotsAndBeads_Basic.java	30 Mar 2009 05:49:22 -0000	1.2
+++ FindDotsAndBeads_Basic.java	31 Mar 2009 03:55:37 -0000	1.3
@@ -2,6 +2,7 @@

 
 import java.util.*;
 

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.Cluster;
 import org.lcsim.recon.cluster.nn.NearestNeighborClusterer;
 import org.lcsim.recon.cluster.util.Clusterer;

@@ -25,7 +26,7 @@

  * See methods javadoc for details on algorithms and implementations.
  *
  * @author D. Onoprienko

- * @version $Id: FindDotsAndBeads_Basic.java,v 1.2 2009/03/30 05:49:22 onoprien Exp $

+ * @version $Id: FindDotsAndBeads_Basic.java,v 1.3 2009/03/31 03:55:37 onoprien Exp $

  */
 public class FindDotsAndBeads_Basic implements RosaryClusterer.FindDotsAndBeads {
 

@@ -99,6 +100,11 @@

 
     LayerDataBase db = _clusterer.getLayerDB();
 

+    System.out.println("FDB: fetched db "+ db.size() +" hitmap size "+ hitMap.size());
+    for (CalorimeterHit hit : hitMap) {
+      System.out.println("Hit layer "+ hit.getLayerNumber() +" de "+ hit.getDetectorElement().getName());
+    }
+

     for (LayerData data : db) {
 
       CalLayer layer = data.cruxLayer;

@@ -106,22 +112,24 @@

       ArrayList<Bead> beads = data.beads;
 
       CruxHitMap layerMap = hitMap.toMap(layer);

-      if (layerMap.isEmpty()) return;

+      System.out.println("Layer "+ layer +" hits "+ layerMap.size());

-      List<Cluster> clusters = _clusterer.createClusters(layerMap);
-      for (Cluster cluster : clusters) {
-        if (cluster.getSize() <= _dotSizeLimit) {
-          dots.add(new Dot(layer, cluster));
-        } else {
-          beads.add(new Bead(layer, cluster));

+      if (!layerMap.isEmpty()) {
+        List<Cluster> clusters = _layerClusterer.createClusters(layerMap);
+        for (Cluster cluster : clusters) {
+          if (cluster.getSize() <= _dotSizeLimit) {
+            dots.add(new Dot(layer, cluster));
+          } else {
+            beads.add(new Bead(layer, cluster));
+          }

         }
       }

+      

       dots.trimToSize();
       beads.trimToSize();
 
     }
 

-    db.initialize();

   }
 
 }

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/drivers

diff -N MipStubFinder.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MipStubFinder.java	31 Mar 2009 03:55:37 -0000	1.1
@@ -0,0 +1,51 @@

+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.*;
+
+/**
+ *
+ *
+ * @author D. Onoprienko
+ * @version $Id: MipStubFinder.java,v 1.1 2009/03/31 03:55:37 onoprien Exp $
+ */
+public class MipStubFinder extends RosaryClusterer {
+
+// -- Private parts :  ---------------------------------------------------------
+
+
+
+// -- Constructors and initialization :  ---------------------------------------
+
+  public MipStubFinder() {
+
+    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);
+
+    setSeedFromTrack(new SeedFromTrack_Basic());
+    setSeedFromDot(new SeedFromDot_Basic());
+
+    setStep(new Step_Basic(this));
+
+    setSearchForDots(new SearchForDots_NN(this));
+    setSearchForBead(new SearchForBead_Basic());
+    setSearchForProximityDots(new SearchForProximityDots_NN(this));
+
+    setReverseThreadingDirection(new ReverseThreadingDirection_Basic());
+    setContinueStepping(new ContinueStepping_Basic());
+    setAcceptThreadedRosary(new AcceptThreadedRosary_Basic());
+    setSelectRosaries(new SelectRosaries_Basic());
+    setComputeTrajectory(new ComputeTrajectory_Basic());
+
+  }
+
+
+}

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/drivers

diff -N CatClusterer.java
--- CatClusterer.java	30 Mar 2009 05:49:23 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@

-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.*;
-
-/**
- *
- *
- * @author D. Onoprienko
- * @version $Id: CatClusterer.java,v 1.2 2009/03/30 05:49:23 onoprien Exp $
- */
-public class CatClusterer extends RosaryClusterer {
-
-// -- Private parts :  ---------------------------------------------------------
-
-
-
-// -- Constructors and initialization :  ---------------------------------------
-
-  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);
-
-    setSeedFromTrack(new SeedFromTrack_Basic());
-    setSeedFromDot(new SeedFromDot_Basic());
-
-    setStep(new Step_Basic(this));
-
-    setSearchForDots(new SearchForDots_NN(this));
-    setSearchForBead(new SearchForBead_Basic());
-    setSearchForProximityDots(new SearchForProximityDots_NN(this));
-
-    setReverseThreadingDirection(new ReverseThreadingDirection_Basic());
-    setContinueStepping(new ContinueStepping_Basic());
-    setAcceptThreadedRosary(new AcceptThreadedRosary_Basic());
-    setSelectRosaries(new SelectRosaries_Basic());
-    setComputeTrajectory(new ComputeTrajectory_Basic());
-
-  }
-
-
-}