7 modified files
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.3 -r1.4
--- ClumpFinder.java 16 Dec 2005 21:12:12 -0000 1.3
+++ ClumpFinder.java 3 Jan 2006 19:34:47 -0000 1.4
@@ -14,8 +14,7 @@
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.geometry.IDDecoder;
-
-import util.decision.*; //import org.lcsim.util.decision.*;
+import org.lcsim.util.decision.*;
/**
* A Driver which finds dense clumps within clusters.
@@ -26,7 +25,7 @@
* or more for each hit. This is hard-coded at the moment, but
* should become a user-definable in a later version.
*
- * @version $Id: ClumpFinder.java,v 1.3 2005/12/16 21:12:12 mcharles Exp $
+ * @version $Id: ClumpFinder.java,v 1.4 2006/01/03 19:34:47 mcharles Exp $
*/
public class ClumpFinder extends Driver
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.1 -r1.2
--- ClusterSizeDecision.java 14 Oct 2005 17:55:14 -0000 1.1
+++ ClusterSizeDecision.java 3 Jan 2006 19:34:47 -0000 1.2
@@ -1,8 +1,7 @@
package structural;
import org.lcsim.event.Cluster;
-
-import util.decision.*; //import org.lcsim.util.decision.*;
+import org.lcsim.util.decision.*;
/**
* Accept clusters if they have at least n hits.
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.8 -r1.9
--- ExamplePFA.java 24 Dec 2005 19:22:39 -0000 1.8
+++ ExamplePFA.java 3 Jan 2006 19:34:47 -0000 1.9
@@ -9,17 +9,14 @@
import org.lcsim.util.Driver;
import org.lcsim.event.Cluster;
import org.lcsim.event.MCParticle;
+import org.lcsim.recon.cluster.mst.*;
import structural.likelihood.*;
-import mst.MSTClusterDriver;
-import mst.GeometricalDistance;
-import mst.MinimumHitToHitDistance;
-import mst.Metrics;
/**
* An example PFA using the structual algorithm.
*
- * @version $Id: ExamplePFA.java,v 1.8 2005/12/24 19:22:39 mcharles Exp $
+ * @version $Id: ExamplePFA.java,v 1.9 2006/01/03 19:34:47 mcharles Exp $
*/
public class ExamplePFA extends Driver
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.4 -r1.5
--- GenericStructuralDriver.java 16 Dec 2005 21:12:13 -0000 1.4
+++ GenericStructuralDriver.java 3 Jan 2006 19:34:48 -0000 1.5
@@ -7,7 +7,7 @@
import java.util.List;
import java.util.Vector;
-import util.decision.DecisionMakerSingle;
+import org.lcsim.util.decision.*;
/**
*
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.1 -r1.2
--- HighHitDensityDecision.java 19 Oct 2005 19:42:09 -0000 1.1
+++ HighHitDensityDecision.java 3 Jan 2006 19:34:48 -0000 1.2
@@ -13,7 +13,7 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.geometry.IDDecoder;
-import util.decision.*; //import org.lcsim.util.decision.*;
+import org.lcsim.util.decision.*;
/**
* A DecisionMaker for CalorimeterHit objects which requires them to
@@ -21,7 +21,7 @@
* Eventually this should be made more flexible and moved outside
* the "structural" package.
*
- * @version $Id: HighHitDensityDecision.java,v 1.1 2005/10/19 19:42:09 mcharles Exp $
+ * @version $Id: HighHitDensityDecision.java,v 1.2 2006/01/03 19:34:48 mcharles Exp $
*/
public class HighHitDensityDecision implements DecisionMakerSingle<CalorimeterHit>
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.4 -r1.5
--- TrackSegmentFinder.java 14 Oct 2005 18:07:08 -0000 1.4
+++ TrackSegmentFinder.java 3 Jan 2006 19:34:48 -0000 1.5
@@ -9,11 +9,8 @@
import org.lcsim.event.Cluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.geometry.IDDecoder;
-
-import util.decision.ListFilter;
-
-import mipfinder.*;
-
+import org.lcsim.recon.cluster.mipfinder.*;
+import org.lcsim.util.decision.*;
/**
* This driver looks at a list of clusters and
lcsim/src/org/lcsim/contrib/uiowa/structural/likelihood
diff -u -r1.5 -r1.6
--- MiscUtilities.java 16 Dec 2005 21:09:28 -0000 1.5
+++ MiscUtilities.java 3 Jan 2006 19:34:49 -0000 1.6
@@ -139,6 +139,10 @@
return null; // Couldn't find a cylindrical detector containing this point
}
+ /*
+ *
+ * Broken by changes to the Subdetector interface...
+
static protected org.lcsim.geometry.layer.Layer findLayer(Hep3Vector point, org.lcsim.geometry.Detector det)
{
org.lcsim.geometry.Subdetector subdet = MiscUtilities.findComponent(point, det);
@@ -204,6 +208,9 @@
return matchingLayer;
}
+ *
+ */
+
// Blah... belongs in Line.
static protected double findDOCAToPoint(Hep3Vector linePoint, Hep3Vector lineDirection, Hep3Vector point)
{
CVSspam 0.2.8