diff -u -r1.1.1.1 -r1.2
--- TrackedParticleFinderDriver.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ TrackedParticleFinderDriver.java	27 Jan 2009 20:48:51 -0000	1.2
@@ -7,9 +7,9 @@

 import hep.physics.vec.VecOp;
 
 import org.lcsim.event.EventHeader;

-import org.lcsim.units.clhep.SystemOfUnits;

 
 import org.lcsim.contrib.onoprien.util.NoSuchParameterException;

+import org.lcsim.contrib.onoprien.util.constants.Units;

 import org.lcsim.contrib.onoprien.util.job.Driver;
 
 import org.lcsim.contrib.onoprien.crux.infrastructure.*;

@@ -18,7 +18,7 @@

  *
  *
  * @author D. Onoprienko

- * @version $Id: TrackedParticleFinderDriver.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $

+ * @version $Id: TrackedParticleFinderDriver.java,v 1.2 2009/01/27 20:48:51 onoprien Exp $

  */
 public class TrackedParticleFinderDriver extends Driver {
   

@@ -183,6 +183,6 @@

   protected String _trackListName;
   protected String _recoListName = "CruxParticles";
   

-  protected double _mergeDist2 = (1.*SystemOfUnits.micrometer) * (1.*SystemOfUnits.micrometer);

+  protected double _mergeDist2 = (1.*Units.micrometer) * (1.*Units.micrometer);

   
 }

diff -u -r1.3 -r1.4
--- CheatTrackFinderDriver.java	26 Jan 2009 05:29:59 -0000	1.3
+++ CheatTrackFinderDriver.java	27 Jan 2009 20:48:51 -0000	1.4
@@ -25,7 +25,7 @@

  * Driver that uses MC truth info to produce a list of tracks.
  *
  * @author D. Onoprienko

- * @version $Id: CheatTrackFinderDriver.java,v 1.3 2009/01/26 05:29:59 onoprien Exp $

+ * @version $Id: CheatTrackFinderDriver.java,v 1.4 2009/01/27 20:48:51 onoprien Exp $

  */
 public class CheatTrackFinderDriver extends Driver implements JobEventListener {
   

@@ -103,9 +103,12 @@

     
     super.process(event);
     

-    // Fetch MCTruth and list of MCParticles

+    // Initialize event-specific data

     
     _mcTruth = (MCTruthVS) event.get(MCTruthVS.KEY);

+    if (_def instanceof RecoDefinitionExtended) {
+      ((RecoDefinitionExtended)_def).setEvent(event);
+    }

     
     // Create list of tracks and save it
     

@@ -131,6 +134,9 @@

     trackList.trimToSize();
     _mcTruth = null;
     _mc2hit = null;

+    if (_def instanceof RecoDefinitionExtended) {
+      ((RecoDefinitionExtended)_def).clearEvent();
+    }

   }
 
 

diff -u -r1.1 -r1.2
--- CheatVertexFinderDriver.java	22 Jan 2009 21:12:42 -0000	1.1
+++ CheatVertexFinderDriver.java	27 Jan 2009 20:48:51 -0000	1.2
@@ -6,9 +6,9 @@

 import hep.physics.vec.VecOp;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;

-import org.lcsim.units.clhep.SystemOfUnits;

 
 import org.lcsim.contrib.onoprien.util.NoSuchParameterException;

+import org.lcsim.contrib.onoprien.util.constants.Units;

 import org.lcsim.contrib.onoprien.util.job.Driver;
 
 import org.lcsim.contrib.onoprien.crux.infrastructure.*;

@@ -22,7 +22,7 @@

  * or flies by it.
  *
  * @author D. Onoprienko

- * @version $Id: CheatVertexFinderDriver.java,v 1.1 2009/01/22 21:12:42 onoprien Exp $

+ * @version $Id: CheatVertexFinderDriver.java,v 1.2 2009/01/27 20:48:51 onoprien Exp $

  */
 public class CheatVertexFinderDriver extends Driver {
   

@@ -186,7 +186,7 @@

   
   protected String _trackListName;
   protected String _vertexListName;

-  protected double _mergeDist2 = (1.*SystemOfUnits.micrometer) * (1.*SystemOfUnits.micrometer);

+  protected double _mergeDist2 = (1.*Units.micrometer) * (1.*Units.micrometer);

   
   protected MCTruthCrux _mcTruth;
 }

diff -u -r1.2 -r1.3
--- CruxTrack.java	22 Jan 2009 21:01:56 -0000	1.2
+++ CruxTrack.java	27 Jan 2009 20:48:51 -0000	1.3
@@ -9,6 +9,7 @@

 import org.lcsim.event.Track;
 import org.lcsim.event.TrackerHit;
 

+import org.lcsim.contrib.onoprien.util.job.JobManager;

 import org.lcsim.contrib.onoprien.util.swim.BField;
 import org.lcsim.contrib.onoprien.util.swim.Helix;
 import org.lcsim.contrib.onoprien.util.swim.ParVector;

@@ -18,7 +19,7 @@

  * Implementation of {@link ITrack} interface.
  *
  * @author D. Onoprienko

- * @version $Id: CruxTrack.java,v 1.2 2009/01/22 21:01:56 onoprien Exp $

+ * @version $Id: CruxTrack.java,v 1.3 2009/01/27 20:48:51 onoprien Exp $

  */
 public class CruxTrack implements ITrack, Track {
   

@@ -41,14 +42,15 @@

   private int _ndf;
   private boolean _fitSuccess;
 

+  private BField _bField;
+

 
 // -- Constructors :  ----------------------------------------------------------
   
   /**
    * Default constructor.
    */

-  public CruxTrack() {
-  }

+  public CruxTrack() {}

   
   /**
    * Fast constructor.

@@ -64,6 +66,13 @@

     _chi2 = 0.;
     _ndf = 0;
     _fitSuccess = true;

+    System.out.println("Constructor "+this);
+  }
+
+  /** Common initialization. */
+  {
+    _bField = JobManager.defaultInstance().get(BField.class);
+    System.out.println("Common "+this);

   }
   
 // -- Implementing org.lcsim.event.Track :  ------------------------------------

@@ -186,7 +195,7 @@

     Helix helix = fNode.node.getTrajectory();
     Hep3Vector out = helix.getDirection(fNode.path);
     if (out != null) {

-      double p = BField.defaultInstance().getMomentum(helix);

+      double p = BField.defaultInstance().getP(helix);

       out = VecOp.mult(p,out);
     }
     return out;

diff -u -r1.1.1.1 -r1.2
--- ITrackAnchor.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ ITrackAnchor.java	27 Jan 2009 20:48:51 -0000	1.2
@@ -4,10 +4,11 @@

 import org.lcsim.contrib.onoprien.vsegment.hit.ITrackerHit;
 
 /**

- * Track anchor - something that knows how to calculate chi-square to a trajectory.

+ * Track anchor - something that affects the fit.
+ * Temporary: something that knows how to calculate chi-square to a trajectory.

  *
  * @author D. Onoprienko

- * @version $Id: ITrackAnchor.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $

+ * @version $Id: ITrackAnchor.java,v 1.2 2009/01/27 20:48:51 onoprien Exp $

  */
 public interface ITrackAnchor {