2 added + 5 modified, total 7 files
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms
diff -u -r1.1 -r1.2
--- ChooseSeedLayers_FirstN.java 29 Mar 2009 23:44:23 -0000 1.1
+++ ChooseSeedLayers_FirstN.java 8 Jul 2009 15:59:25 -0000 1.2
@@ -2,13 +2,13 @@
import java.util.*;
-import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
+import org.lcsim.contrib.onoprien.util.job.NoSuchParameterException;
import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.util.job.JobEvent;
import org.lcsim.contrib.onoprien.util.job.JobEventListener;
import org.lcsim.contrib.onoprien.util.job.JobManager;
-import org.lcsim.contrib.onoprien.crux.geom.CalLayer;
+import org.lcsim.contrib.onoprien.geom.calorimeter.CalLayer;
import org.lcsim.contrib.onoprien.crux.itc.LayerData;
import org.lcsim.contrib.onoprien.crux.itc.LayerDataBase;
import org.lcsim.contrib.onoprien.crux.itc.RosaryClusterer;
@@ -20,7 +20,7 @@
* See methods javadoc for details on algorithms and implementations.
*
* @author D. Onoprienko
- * @version $Id: ChooseSeedLayers_FirstN.java,v 1.1 2009/03/29 23:44:23 onoprien Exp $
+ * @version $Id: ChooseSeedLayers_FirstN.java,v 1.2 2009/07/08 15:59:25 onoprien Exp $
*/
public class ChooseSeedLayers_FirstN implements RosaryClusterer.ChooseSeedLayers, JobEventListener {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms
diff -u -r1.4 -r1.5
--- FindDotsAndBeads_Basic.java 31 Mar 2009 04:09:29 -0000 1.4
+++ FindDotsAndBeads_Basic.java 8 Jul 2009 15:59:25 -0000 1.5
@@ -7,13 +7,13 @@
import org.lcsim.recon.cluster.nn.NearestNeighborClusterer;
import org.lcsim.recon.cluster.util.Clusterer;
-import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
+import org.lcsim.contrib.onoprien.util.job.NoSuchParameterException;
import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.util.job.JobManager;
-import org.lcsim.contrib.onoprien.crux.geom.CalLayer;
-import org.lcsim.contrib.onoprien.crux.geom.CalGeometry;
-import org.lcsim.contrib.onoprien.crux.infrastructure.CruxHitMap;
+import org.lcsim.contrib.onoprien.geom.calorimeter.CalLayer;
+import org.lcsim.contrib.onoprien.geom.calorimeter.CalGeometry;
+import org.lcsim.contrib.onoprien.data.CalHitMap;
import org.lcsim.contrib.onoprien.crux.itc.Bead;
import org.lcsim.contrib.onoprien.crux.itc.Dot;
import org.lcsim.contrib.onoprien.crux.itc.LayerData;
@@ -21,12 +21,12 @@
import org.lcsim.contrib.onoprien.crux.itc.RosaryClusterer;
/**
- * Implements findDotsAndBeads(CruxHitMap hitMap).
+ * Implements findDotsAndBeads(CalHitMap hitMap).
* <p>
* See methods javadoc for details on algorithms and implementations.
*
* @author D. Onoprienko
- * @version $Id: FindDotsAndBeads_Basic.java,v 1.4 2009/03/31 04:09:29 onoprien Exp $
+ * @version $Id: FindDotsAndBeads_Basic.java,v 1.5 2009/07/08 15:59:25 onoprien Exp $
*/
public class FindDotsAndBeads_Basic implements RosaryClusterer.FindDotsAndBeads {
@@ -96,7 +96,7 @@
*
* @param hitMap Map of all calorimeter hits to be used in finding Dots and Beads.
*/
- public void findDotsAndBeads(CruxHitMap hitMap) {
+ public void findDotsAndBeads(CalHitMap hitMap) {
LayerDataBase db = _clusterer.getLayerDB();
@@ -106,7 +106,7 @@
ArrayList<Dot> dots = data.dots;
ArrayList<Bead> beads = data.beads;
- CruxHitMap layerMap = hitMap.toMap(layer);
+ CalHitMap layerMap = hitMap.toMap(layer);
if (!layerMap.isEmpty()) {
List<Cluster> clusters = _layerClusterer.createClusters(layerMap);
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms
diff -u -r1.2 -r1.3
--- SearchForProximityDots_NN.java 6 Apr 2009 19:49:26 -0000 1.2
+++ SearchForProximityDots_NN.java 8 Jul 2009 15:59:25 -0000 1.3
@@ -7,7 +7,7 @@
import org.lcsim.contrib.onoprien.util.job.JobManager;
import org.lcsim.contrib.onoprien.util.swim.Trajectory;
-import org.lcsim.contrib.onoprien.crux.geom.CalGeometry;
+import org.lcsim.contrib.onoprien.geom.calorimeter.CalGeometry;
import org.lcsim.contrib.onoprien.crux.itc.LayerData;
import org.lcsim.contrib.onoprien.crux.itc.Dot;
import org.lcsim.contrib.onoprien.crux.itc.Rosary;
@@ -21,7 +21,7 @@
* See methods javadoc for details on algorithms and implementations.
*
* @author D. Onoprienko
- * @version $Id: SearchForProximityDots_NN.java,v 1.2 2009/04/06 19:49:26 onoprien Exp $
+ * @version $Id: SearchForProximityDots_NN.java,v 1.3 2009/07/08 15:59:25 onoprien Exp $
*/
public class SearchForProximityDots_NN implements RosaryClusterer.SearchForProximityDots {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms
diff -u -r1.1 -r1.2
--- SeedFromTrack_Basic.java 29 Mar 2009 23:44:23 -0000 1.1
+++ SeedFromTrack_Basic.java 8 Jul 2009 15:59:25 -0000 1.2
@@ -1,6 +1,6 @@
package org.lcsim.contrib.onoprien.crux.itc.algorithms;
-import org.lcsim.contrib.onoprien.crux.infrastructure.ITrack;
+import org.lcsim.contrib.onoprien.data.ITrack;
import org.lcsim.contrib.onoprien.crux.itc.Rosary;
import org.lcsim.contrib.onoprien.crux.itc.RosaryClusterer;
import org.lcsim.contrib.onoprien.crux.itc.Track;
@@ -12,7 +12,7 @@
* See methods javadoc for details on algorithms and implementations.
*
* @author D. Onoprienko
- * @version $Id: SeedFromTrack_Basic.java,v 1.1 2009/03/29 23:44:23 onoprien Exp $
+ * @version $Id: SeedFromTrack_Basic.java,v 1.2 2009/07/08 15:59:25 onoprien Exp $
*/
public class SeedFromTrack_Basic implements RosaryClusterer.SeedFromTrack {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/algorithms
diff -u -r1.3 -r1.4
--- Step_Basic.java 10 Jun 2009 17:53:50 -0000 1.3
+++ Step_Basic.java 8 Jul 2009 15:59:25 -0000 1.4
@@ -5,8 +5,8 @@
import org.lcsim.contrib.onoprien.util.job.JobManager;
import org.lcsim.contrib.onoprien.util.swim.Trajectory;
-import org.lcsim.contrib.onoprien.crux.geom.CalGeometry;
-import org.lcsim.contrib.onoprien.crux.geom.CalLayer;
+import org.lcsim.contrib.onoprien.geom.calorimeter.CalGeometry;
+import org.lcsim.contrib.onoprien.geom.calorimeter.CalLayer;
import org.lcsim.contrib.onoprien.crux.itc.Bead;
import org.lcsim.contrib.onoprien.crux.itc.Crack;
import org.lcsim.contrib.onoprien.crux.itc.Dot;
@@ -21,7 +21,7 @@
* See methods javadoc for details on algorithms and implementations.
*
* @author D. Onoprienko
- * @version $Id: Step_Basic.java,v 1.3 2009/06/10 17:53:50 onoprien Exp $
+ * @version $Id: Step_Basic.java,v 1.4 2009/07/08 15:59:25 onoprien Exp $
*/
public class Step_Basic implements RosaryClusterer.Step {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/drivers
diff -N BasicITC.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ BasicITC.java 8 Jul 2009 15:59:26 -0000 1.1
@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.contrib.onoprien.crux.itc.drivers;
+
+/**
+ *
+ *
+ * @author D. Onoprienko
+ * @version $Id: BasicITC.java,v 1.1 2009/07/08 15:59:26 onoprien Exp $
+ */
+public class BasicITC {
+
+// -- Private parts : ---------------------------------------------------------
+
+
+
+// -- Constructors and initialization : ---------------------------------------
+
+
+}
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/itc/drivers
diff -N SeedTrackerConfirm.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SeedTrackerConfirm.java 8 Jul 2009 15:59:26 -0000 1.1
@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.contrib.onoprien.crux.itc.drivers;
+
+/**
+ *
+ *
+ * @author D. Onoprienko
+ * @version $Id: SeedTrackerConfirm.java,v 1.1 2009/07/08 15:59:26 onoprien Exp $
+ */
+public class SeedTrackerConfirm {
+
+// -- Private parts : ---------------------------------------------------------
+
+
+
+// -- Constructors and initialization : ---------------------------------------
+
+
+}
CVSspam 0.2.8