diff -u -r1.15 -r1.16
--- Fitter.java	28 Oct 2006 00:48:32 -0000	1.15
+++ Fitter.java	1 Dec 2006 00:10:49 -0000	1.16
@@ -2,7 +2,7 @@

 package org.lcsim.contrib.JanStrube.vtxFitter;
 
 /**

- * @version $Id: Fitter.java,v 1.15 2006/10/28 00:48:32 jstrube Exp $

+ * @version $Id: Fitter.java,v 1.16 2006/12/01 00:10:49 jstrube Exp $

  */
 
 import Jama.util.Maths;

@@ -220,7 +220,7 @@

     // return a.times(b);
     // }
 

-    public static Matrix getMomentumDerivativeMatrix(SpacePoint x, SpacePoint p, int charge, double Bz) {

+    public static Matrix getMomentumDerivativeMatrix(SpacePoint x, SpaceVector p, int charge, double Bz) {

         double field = Bz * fieldConversion;
         double pt = p.rxy();
         double px0 = p.x() - charge * field;

@@ -249,7 +249,7 @@

      * @param charge
      * @return the derivatives Matrix. Assumes an ordering of ??? in the measurement vector
      */

-    public static Matrix getSpatialDerivativeMatrix(SpacePoint x, SpacePoint p, int charge, double Bz) {

+    public static Matrix getSpatialDerivativeMatrix(SpacePoint x, SpaceVector p, int charge, double Bz) {

         double field = Bz * fieldConversion;
 
         double px0 = p.x() - charge * field;

diff -N TrackComparison.java
--- TrackComparison.java	29 Aug 2006 19:50:18 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@

-/**
- * @version $Id: TrackComparison.java,v 1.1 2006/08/29 19:50:18 jstrube Exp $
- */
-
-
-import hep.physics.particle.Particle;
-import hep.physics.vec.Hep3Vector;
-
-import org.lcsim.contrib.JanStrube.tracking.NewFastMCTrackFactory;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.Track;
-import org.lcsim.mc.fast.tracking.MCFastTracking;
-import org.lcsim.mc.fast.tracking.ReconTrack;
-import org.lcsim.spacegeom.CartesianPoint;
-import org.lcsim.spacegeom.SpacePoint;
-import org.lcsim.util.Driver;
-
-import Jama.Matrix;
-
-/**
- * Compares the New FastMC Tracks to the information in RecoTrack
- * @author jstrube
- *
- */
-public class TrackComparison extends Driver {
-    public TrackComparison() {
-        add(new MCFastTracking(false, false));
-    }
-    public void process(EventHeader event) {
-        super.process(event);
-        System.out.println("processing...");
-        NewFastMCTrackFactory factory = new NewFastMCTrackFactory(event, false);
-        for (Track oldTrack : event.getTracks()) {
-            ReconTrack recoTrack = (ReconTrack) oldTrack;
-            Particle p = recoTrack.getMCParticle();
-            org.lcsim.contrib.JanStrube.tracking.Track newTrack = factory.getTrack(p.getMomentum(), p.getOrigin(), (int)p.getCharge());
-            System.out.printf("ReconTrack: %s\n", new Matrix(recoTrack.getErrorMatrix()));
-            SpacePoint p_recon = new SpacePoint(recoTrack.getMomentumVec());
-            SpacePoint p_newTrack = newTrack.getMomentum();
-            SpacePoint r_recon = new CartesianPoint(recoTrack.getReferencePoint());
-            SpacePoint r_newTrack = newTrack.getPosition();
-            System.out.printf("NewTrack: %s\n", newTrack.getErrorMatrix());
-        }
-    }
-}
-

diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	1 Dec 2006 00:10:51 -0000	1.1
@@ -0,0 +1,2 @@

+Makefile
+svnignore

diff -u -r1.4 -r1.5
--- NewMCFastTrackDriver.java	28 Oct 2006 00:48:41 -0000	1.4
+++ NewMCFastTrackDriver.java	1 Dec 2006 00:10:51 -0000	1.5
@@ -1,5 +1,5 @@

 /**

- * @version $Id: NewMCFastTrackDriver.java,v 1.4 2006/10/28 00:48:41 jstrube Exp $

+ * @version $Id: NewMCFastTrackDriver.java,v 1.5 2006/12/01 00:10:51 jstrube Exp $

  */
 package org.lcsim.contrib.JanStrube.tracking;
 

@@ -91,7 +91,7 @@

             trackList.add(passpartout);
             newTrackList.add(t);
         }

-        event.put(EventHeader.TRACKS, trackList, org.lcsim.event.Track.class, 0);

+        event.put(EventHeader.TRACKS, newTrackList, Track.class, 0);

     }
 
     public void conditionsChanged(ConditionsEvent event) {