diff -u -r1.14 -r1.15
--- ZvTop.java	10 Aug 2005 07:30:32 -0000	1.14
+++ ZvTop.java	16 Aug 2005 19:52:04 -0000	1.15
@@ -31,8 +31,8 @@

 
 // TODO think about implementation in terms of static members
 /**

- * Main class to handle the vertexing
- * Vertices are found by the function

+ * Main class to handle the vertexing Vertices are found by the function
+ * 

  * @see #findVertices(List)
  * @author jstrube
  */

@@ -46,55 +46,58 @@

     // has an effect on many of the other classes
     // Special weight for the IP in the overlap function
     private double ipWeight = 1;

-    // Special weight for the angle of the spatial point (argument of overlap) 

+    // Special weight for the angle of the spatial point (argument of overlap)

     // wrt. the jet axis
     private double angularWeight = 10;
     private double resolvedCut = 0;
     private double chiSquareCut = 0;
     private double _maxDistFromIP = 25;

-    //  Number of points to check along the line from point 1 to point 2

+    // Number of points to check along the line from point 1 to point 2

     int iterationMax = 3000;

-    

+

     private double sigmaT;
     private double sigmaL;

-    
-    

+

     public void setMaxDistFromIP(double d) {
         _maxDistFromIP = d;
     }

-    

+

     public void setIpWeight(double w) {
         ipWeight = w;
     }

-    

+

     public void setAngularWeight(double w) {
         angularWeight = w;
     }

-    

+

     public void setResolvedCut(double c) {
         resolvedCut = c;
     }

-    

+

     public void setChiSquareCut(double c) {
         chiSquareCut = c;
     }

-    

+

     private Hep3Vector _jetAxis;

-    //  resolution function is expensive in CPU    

+    // resolution function is expensive in CPU

     private Map<ZvMaximum, Set<ZvMaximum>> isResolvedFromMap;
     private Map<ZvMaximum, Set<ZvMaximum>> unresolvedMaximaMap;

-    

+

     // List of vertex candidates.

-    // The two-track maxima are transformed to the nearest location of a maximum in the overlap function.
-    // The highest of those maxima is taken as the location of the vertex and all tracks belonging to ZvMaxima that are unresolved from this highest maximum are added to the vertex.

+    // The two-track maxima are transformed to the nearest location of a maximum
+    // in the overlap function.
+    // The highest of those maxima is taken as the location of the vertex and
+    // all tracks belonging to ZvMaxima that are unresolved from this highest
+    // maximum are added to the vertex.

     // At this stage tracks can be assigned to more than one vertex.

-    // The fitVertices function takes care of assigning tracks uniquely to a vertex.

+    // The fitVertices function takes care of assigning tracks uniquely to a
+    // vertex.

     // TODO need to distinguish between pruning and fitting
     private List<ZvVertex> _vertexCandidateList;

-    

+

     /**
      * @author jstrube

-     *

+     * 

      */
     class MaxComp implements Comparator {
 

@@ -106,7 +109,9 @@

             // TODO Auto-generated constructor stub
         }
 

-        /* (non-Javadoc)

+        /*
+         * (non-Javadoc)
+         * 

          * @see java.util.Comparator#compare(T, T)
          */
         public int compare(Object arg1, Object arg2) {

@@ -124,11 +129,11 @@

         }
 
     }

-    

+

     /**

-     * Constructor
-     * Creates a list of ZvTracks from the argument list.
-     * Calculates the overlap and resolution functions for the tracks

+     * Constructor Creates a list of ZvTracks from the argument list. Calculates
+     * the overlap and resolution functions for the tracks
+     * 

      * @param jetAxisValue
      */
     public ZvTop(Hep3Vector jetAxisValue, ZvFitter f) {

@@ -144,23 +149,24 @@

         vtxFitter = f;
         return;
     }

-      

+

     /**
      * Finds the Maxima

+     * 

      * @param list
      * @return
      */
     public List<ZvVertex> findVertices(List<Track> list) {
         trackList.clear();
         System.err.println("entering findVertives\n");

-//         FIXME Put in IP as constraint. At the moment, no vertex contains IP        

diff -u -r1.11 -r1.12
--- ZvSwimmer.java	12 Aug 2005 03:09:05 -0000	1.11
+++ ZvSwimmer.java	16 Aug 2005 19:52:04 -0000	1.12
@@ -5,7 +5,9 @@

 
 import hep.physics.vec.BasicHep3Vector;
 import hep.physics.vec.Hep3Vector;

+import hep.physics.vec.VecOp;

+import org.lcsim.event.Track;

 import org.lcsim.geometry.Detector;
 import org.lcsim.spacegeom.CartesianPoint;
 import org.lcsim.spacegeom.SpacePoint;

@@ -75,12 +77,12 @@

      * @param targetPosition the point in space where to swim the track
      * @return a ZvFitStatus object to determine if the action was successful
      */

-    public ZvFitStatus swimTo(ZvTrack track, SpacePoint targetPosition) {

+    public ZvFitStatus swimTo(Track track, SpacePoint targetPosition) {

         Hep3Vector orgBField = new BasicHep3Vector(detector.getFieldMap().getField(track.getReferencePoint()));

-        Hep3Vector orgTangent = getUnitTangent(track.zvParameters());

+        Hep3Vector orgTangent = getUnitTangent(track.getTrackParameters());

         Hep3Vector orgNormal = cross(orgTangent, orgBField);
         ZvFitStatus status = ZvFitStatus.FAILED_ON_ENTRY; 

-        ZvParameters orgParameters = new ZvParameters(track.zvParameters());

+        Track.Parameters orgParameters = new Track.Parameters(track.getTrackParameters());

         Matrix orgErrorMatrix = new Matrix(track.getErrorMatrix());
         
         // FIXME detector radius

@@ -90,13 +92,14 @@

             return ZvFitStatus.POS_OUT_OF_VOLUME;
 
         // get track parameters and error matrix

-        ZvParameters hlxPar = track.zvParameters();

+        double[] hlxPar = track.getTrackParameters();

         double[][] dHlxPar = track.getErrorMatrix();
         
         double charge = track.getCharge();
         double sgnq = charge / Math.abs(charge);
 

-        double pTot = track.momentum().magnitude();

diff -u -r1.2 -r1.3
--- ZvVertex.java	10 Aug 2005 07:30:32 -0000	1.2
+++ ZvVertex.java	16 Aug 2005 19:52:04 -0000	1.3
@@ -9,6 +9,7 @@

 import java.util.Map;
 import java.util.Set;
 

+import org.lcsim.event.Track;

 import org.lcsim.spacegeom.CartesianPoint;
 import org.lcsim.spacegeom.SpacePoint;
 

@@ -28,7 +29,7 @@

  * NOTE: An unfitted vertex can share tracks with another vertex !
  * TODO pruning <-> fitting
  * @author J. Strube

- * 

+ * @version

  */
 // -------------------------------------------------------------------------
 public class ZvVertex extends SpacePoint {

@@ -224,6 +225,17 @@

         return longDist;
     }
 

diff -u -r1.15 -r1.16
--- ZvFitter.java	2 Aug 2005 17:55:23 -0000	1.15
+++ ZvFitter.java	16 Aug 2005 19:52:04 -0000	1.16
@@ -14,6 +14,7 @@

 import java.util.List;
 import java.util.Set;
 

+import org.lcsim.event.Track;

 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.FieldMap;
 import org.lcsim.spacegeom.CartesianPoint;

@@ -26,7 +27,7 @@

  * Fitter class based on a least squares method
  * 
  * @author W.Walkowiak, 09/18/00

- * @version $Id: ZvFitter.java,v 1.15 2005/08/02 17:55:23 jstrube Exp $

+ * @version $Id: ZvFitter.java,v 1.16 2005/08/16 19:52:04 jstrube Exp $

  */
 
 /* TODO static members only

@@ -150,7 +151,11 @@

 
         // the outer loop
         ZvVertex fittedVertex = vtx;

-        Set<ZvTrack> trackList = new HashSet<ZvTrack>(vtx.getVtxTracks());

+        Set<Track> trackList = new HashSet<Track>();
+        for (ZvTrack iTrack : vtx.getVtxTracks()) {
+            trackList.add(iTrack.orgTrack);
+        }
+        

         int iter = 0;
         double dis = 99999.;
         // TODO make nicer loop

@@ -175,7 +180,8 @@

             status = ZvFitStatus.OK;
 
         // prepare fittedVertex for output

-        fittedVertex.setVtxTracks(trackList);