4 modified files
hps-java/src/main/java/org/lcsim/hps/recon/tracking/kalman
diff -u -r1.3 -r1.4
--- FullFitKalman.java 27 Jul 2011 23:33:44 -0000 1.3
+++ FullFitKalman.java 28 Jul 2011 18:29:10 -0000 1.4
@@ -3,9 +3,9 @@
import java.util.Iterator;
import java.util.List;
-import org.lcsim.contrib.RobKutschke.TRFSelfTest.util.RKDebug;
-import org.lcsim.contrib.RobKutschke.TRFSelfTest.util.SurfaceCode;
-import org.lcsim.contrib.RobKutschke.TRFSelfTest.util.VTUtil;
+import org.lcsim.hps.recon.tracking.kalman.util.RKDebug;
+import org.lcsim.hps.recon.tracking.kalman.util.SurfaceCode;
+import org.lcsim.hps.recon.tracking.kalman.util.VTUtil;
import org.lcsim.recon.tracking.trfbase.ETrack;
import org.lcsim.recon.tracking.trfbase.Hit;
import org.lcsim.recon.tracking.trfbase.PropDir;
@@ -40,9 +40,9 @@
* a single track.
*
*@author $Author: jeremy $
- *@version $Id: FullFitKalman.java,v 1.3 2011/07/27 23:33:44 jeremy Exp $
+ *@version $Id: FullFitKalman.java,v 1.4 2011/07/28 18:29:10 jeremy Exp $
*
- * Date $Date: 2011/07/27 23:33:44 $
+ * Date $Date: 2011/07/28 18:29:10 $
*
*/
public class FullFitKalman extends FullFitter {
hps-java/src/main/java/org/lcsim/hps/recon/tracking/kalman
diff -u -r1.3 -r1.4
--- KalmanGeom.java 27 Jul 2011 23:33:44 -0000 1.3
+++ KalmanGeom.java 28 Jul 2011 18:29:10 -0000 1.4
@@ -1,40 +1,38 @@
package org.lcsim.hps.recon.tracking.kalman;
import hep.physics.vec.Hep3Vector;
+
import java.util.ArrayList;
import java.util.List;
-import org.lcsim.contrib.RobKutschke.TRF.trfdca.PropDCAZ;
-import org.lcsim.event.TrackerHit;
-import org.lcsim.geometry.Detector;
-
-import org.lcsim.recon.tracking.trfbase.Propagator;
-import org.lcsim.recon.tracking.trfbase.PropDispatch;
-import org.lcsim.recon.tracking.trfcyl.PropCyl;
-import org.lcsim.recon.tracking.trffit.HTrack;
-import org.lcsim.recon.tracking.trfzp.PropZZ;
-import org.lcsim.recon.tracking.trfdca.PropDCACyl;
-import org.lcsim.recon.tracking.trfdca.PropCylDCA;
-import org.lcsim.recon.tracking.trfcylplane.PropCylZ;
-import org.lcsim.recon.tracking.trfcylplane.PropZCyl;
-
-import org.lcsim.recon.tracking.trfcyl.SurfCylinder;
-import org.lcsim.recon.tracking.trfdca.SurfDCA;
-import org.lcsim.recon.tracking.trfzp.SurfZPlane;
-
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.solids.ISolid;
import org.lcsim.detector.solids.Point3D;
+import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+import org.lcsim.geometry.Detector;
+import org.lcsim.hps.recon.tracking.kalman.util.PropDCAZ;
import org.lcsim.recon.tracking.trfbase.ETrack;
import org.lcsim.recon.tracking.trfbase.Hit;
+import org.lcsim.recon.tracking.trfbase.PropDispatch;
+import org.lcsim.recon.tracking.trfbase.Propagator;
import org.lcsim.recon.tracking.trfbase.VTrack;
+import org.lcsim.recon.tracking.trfcyl.PropCyl;
+import org.lcsim.recon.tracking.trfcyl.SurfCylinder;
+import org.lcsim.recon.tracking.trfcylplane.PropCylZ;
+import org.lcsim.recon.tracking.trfcylplane.PropZCyl;
+import org.lcsim.recon.tracking.trfdca.PropCylDCA;
+import org.lcsim.recon.tracking.trfdca.PropDCACyl;
+import org.lcsim.recon.tracking.trfdca.SurfDCA;
+import org.lcsim.recon.tracking.trffit.HTrack;
import org.lcsim.recon.tracking.trfxyp.ClusXYPlane1;
import org.lcsim.recon.tracking.trfxyp.PropXYXY;
import org.lcsim.recon.tracking.trfxyp.SurfXYPlane;
+import org.lcsim.recon.tracking.trfzp.PropZZ;
+import org.lcsim.recon.tracking.trfzp.SurfZPlane;
/**
*
@@ -43,9 +41,9 @@
*
*
*@author $Author: jeremy $
- *@version $Id: KalmanGeom.java,v 1.3 2011/07/27 23:33:44 jeremy Exp $
+ *@version $Id: KalmanGeom.java,v 1.4 2011/07/28 18:29:10 jeremy Exp $
*
- * Date $Date: 2011/07/27 23:33:44 $
+ * Date $Date: 2011/07/28 18:29:10 $
*
*/
/* To make the Kalman filter work for any detector, the type of hit that is
hps-java/src/main/java/org/lcsim/hps/recon/tracking/kalman
diff -u -r1.2 -r1.3
--- TrackUtils.java 7 Jul 2011 20:57:38 -0000 1.2
+++ TrackUtils.java 28 Jul 2011 18:29:10 -0000 1.3
@@ -4,9 +4,8 @@
*/
package org.lcsim.hps.recon.tracking.kalman;
-import Jama.Matrix;
import hep.physics.matrix.SymmetricMatrix;
-import org.lcsim.contrib.Pelham.analysis.HelixParamCalculator;
+
import org.lcsim.event.MCParticle;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelixUtils;
@@ -16,7 +15,8 @@
import org.lcsim.recon.tracking.trfbase.VTrack;
import org.lcsim.recon.tracking.trfdca.SurfDCA;
import org.lcsim.recon.tracking.trfutil.TRFMath;
-import org.lcsim.recon.tracking.trfxyp.SurfXYPlane;
+
+import Jama.Matrix;
/**
* Class for converting lcsim tracks to trf tracks.
hps-java/src/main/java/org/lcsim/hps/users/mgraham
diff -u -r1.3 -r1.4
--- KalmanGeom.java 27 Jul 2011 23:33:44 -0000 1.3
+++ KalmanGeom.java 28 Jul 2011 18:29:10 -0000 1.4
@@ -1,37 +1,15 @@
package org.lcsim.hps.users.mgraham;
-import hep.physics.matrix.BasicMatrix;
import hep.physics.matrix.SymmetricMatrix;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.lcsim.contrib.RobKutschke.TRF.trfdca.PropDCAZ;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.event.TrackerHit;
-import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.tracking.kalman.KalmanSurface;
-import org.lcsim.hps.recon.tracking.kalman.PropDCAXY;
-import org.lcsim.hps.recon.tracking.kalman.PropXYXY;
-import org.lcsim.hps.recon.tracking.kalman.ShapeDispatcher;
-
-import org.lcsim.recon.tracking.trfbase.Propagator;
-import org.lcsim.recon.tracking.trfbase.PropDispatch;
-import org.lcsim.recon.tracking.trfcyl.PropCyl;
-import org.lcsim.recon.tracking.trffit.HTrack;
-import org.lcsim.recon.tracking.trfzp.PropZZ;
-import org.lcsim.recon.tracking.trfdca.PropDCACyl;
-import org.lcsim.recon.tracking.trfdca.PropCylDCA;
-import org.lcsim.recon.tracking.trfcylplane.PropCylZ;
-import org.lcsim.recon.tracking.trfcylplane.PropZCyl;
-
-import org.lcsim.recon.tracking.trfcyl.SurfCylinder;
-import org.lcsim.recon.tracking.trfdca.SurfDCA;
-import org.lcsim.recon.tracking.trfzp.SurfZPlane;
-
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.IReadout;
@@ -42,20 +20,35 @@
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
-import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+import org.lcsim.geometry.Detector;
+import org.lcsim.hps.recon.tracking.kalman.KalmanSurface;
+import org.lcsim.hps.recon.tracking.kalman.PropDCAXY;
import org.lcsim.hps.recon.tracking.kalman.PropXYDCA;
+import org.lcsim.hps.recon.tracking.kalman.PropXYXY;
+import org.lcsim.hps.recon.tracking.kalman.ShapeDispatcher;
+import org.lcsim.hps.recon.tracking.kalman.util.PropDCAZ;
import org.lcsim.recon.tracking.trfbase.ETrack;
-import org.lcsim.recon.tracking.trfbase.Hit;
+import org.lcsim.recon.tracking.trfbase.PropDispatch;
+import org.lcsim.recon.tracking.trfbase.Propagator;
import org.lcsim.recon.tracking.trfbase.VTrack;
-import org.lcsim.recon.tracking.trfxyp.ClusXYPlane1;
+import org.lcsim.recon.tracking.trfcyl.PropCyl;
+import org.lcsim.recon.tracking.trfcyl.SurfCylinder;
+import org.lcsim.recon.tracking.trfcylplane.PropCylZ;
+import org.lcsim.recon.tracking.trfcylplane.PropZCyl;
+import org.lcsim.recon.tracking.trfdca.PropCylDCA;
+import org.lcsim.recon.tracking.trfdca.PropDCACyl;
+import org.lcsim.recon.tracking.trfdca.SurfDCA;
+import org.lcsim.recon.tracking.trffit.HTrack;
import org.lcsim.recon.tracking.trfxyp.ClusXYPlane2;
import org.lcsim.recon.tracking.trfxyp.HitXYPlane2;
-
import org.lcsim.recon.tracking.trfxyp.SurfXYPlane;
+import org.lcsim.recon.tracking.trfzp.PropZZ;
+import org.lcsim.recon.tracking.trfzp.SurfZPlane;
/**
*
@@ -64,9 +57,9 @@
*
*
*@author $Author: jeremy $
- *@version $Id: KalmanGeom.java,v 1.3 2011/07/27 23:33:44 jeremy Exp $
+ *@version $Id: KalmanGeom.java,v 1.4 2011/07/28 18:29:10 jeremy Exp $
*
- * Date $Date: 2011/07/27 23:33:44 $
+ * Date $Date: 2011/07/28 18:29:10 $
*
*/
/* To make the Kalman filter work for any detector, the type of hit that is
CVSspam 0.2.8
