lcsim/src/org/lcsim/recon/vertexing/zvtop4

diff -u -r1.15 -r1.16
--- ZvUtil.java	31 Jan 2006 23:34:34 -0000	1.15
+++ ZvUtil.java	22 May 2006 07:56:42 -0000	1.16
@@ -11,6 +11,7 @@

 import org.lcsim.spacegeom.SpacePath;
 import org.lcsim.spacegeom.SpacePoint;
 import org.lcsim.spacegeom.SpacePointVector;

+import org.lcsim.util.swim.HelixSwimmer;

 
 import Jama.Matrix;
 

@@ -25,7 +26,7 @@

 /**
  * Repository of utility functions
  * @author jstrube

- * @version $Id: ZvUtil.java,v 1.15 2006/01/31 23:34:34 jstrube Exp $

+ * @version $Id: ZvUtil.java,v 1.16 2006/05/22 07:56:42 jstrube Exp $

  */
 final class ZvUtil {
 

@@ -46,6 +47,14 @@

         return parabolaPocaTwoTrackMax(iTrack, jTrack);
     }
     

+    private static SpacePoint swimmerTwoTrackMax(Track iTrack, Track jTrack) {
+        HelixSwimmer swimmer = new HelixSwimmer(5);
+        swimmer.setTrack(iTrack);
+        swimmer.getDistanceToPoint(new CartesianPoint(jTrack.getReferencePoint()));
+        
+        return new SpacePoint();
+    }
+    

     private static SpacePoint parabolaPocaTwoTrackMax(ZvTrack iTrack, ZvTrack jTrack) {
         SpacePoint maxLocation = null;
         // limit the region where to look to the vertex detector.

lcsim/src/org/lcsim/recon/vertexing/zvtop4

diff -u -r1.3 -r1.4
--- ZvFitStatus.java	21 Apr 2005 23:44:04 -0000	1.3
+++ ZvFitStatus.java	22 May 2006 07:56:42 -0000	1.4
@@ -1,11 +1,22 @@

+//@+leo-ver=4
+//@+node:@file /home/jstrube/Workspace/lcsim/src/org/lcsim/recon/vertexing/zvtop4/ZvFitStatus.java
+//@@language java
+
+//@<< ZvFitStatus declarations >>
+//@+node:<< ZvFitStatus declarations >>

 package org.lcsim.recon.vertexing.zvtop4;
 
 /**
  * Status enum for the package
  * @author W.Walkowiak, 09/19/00

- * @version $Id: ZvFitStatus.java,v 1.3 2005/04/21 23:44:04 jstrube Exp $

+ * @version $Id: ZvFitStatus.java,v 1.4 2006/05/22 07:56:42 jstrube Exp $

  */

+//@nonl
+//@-node:<< ZvFitStatus declarations >>
+//@nl

+//@+others
+//@+node:enum ZvFitStatus

 public enum ZvFitStatus {
     OK, NOT_FITTED, UNKNOWN_ERROR, NO_TRACKS, INVALID_FITMODE, NOT_ENOUGH_INP_TRACKS, TOO_MANY_INP_TRACKS, SINGULAR_MATRIX, NEG_SQR_ERR_IN_TRACKS, NEG_SQR_ERR_IN_VTX, INPUT_TRACK_FAILURE, ERROR_INIT_FAILURE, NAN_ERROR_IN_DIST, SWIM_FAILURE, NO_CONVERGENCE, TRAJ_PARALLEL, ERROR_IN_GHOST, TRACK_DOUBLE_COUNTING, TRACK_NOT_FOUND_FINAL, NOT_ENOUGH_TRACKS, FIT_FAILURE, INITIALIZED, NO_JET_DIRECTION, NO_GUESS_DIRECTION, CHI2CALC_FAILURE, TRACKS_NOT_SWUM, POOR_QUALITY, NOT_SWUM, TOO_BIG_DIP_ANGLE, TOO_MANY_ITERATIONS, FAILED_ON_ENTRY, POS_OUT_OF_VOLUME, ZERO_B_FIELD;
 

@@ -112,3 +123,7 @@

         return result;
     }
 }

+//@-node:enum ZvFitStatus
+//@-others
+//@-node:@file /home/jstrube/Workspace/lcsim/src/org/lcsim/recon/vertexing/zvtop4/ZvFitStatus.java
+//@-leo

lcsim/src/org/lcsim/recon/vertexing/zvtop4

diff -u -r1.1 -r1.2
--- .cvsignore	29 Jun 2005 00:58:32 -0000	1.1
+++ .cvsignore	22 May 2006 07:56:42 -0000	1.2
@@ -1 +1,2 @@

 *.swp

+*.leo

lcsim/src/org/lcsim/recon/vertexing/zvtop4

diff -u -r1.25 -r1.26
--- ZvTop.java	31 Jan 2006 23:34:34 -0000	1.25
+++ ZvTop.java	22 May 2006 07:56:42 -0000	1.26
@@ -32,7 +32,7 @@

  * Main class to handle the vertexing Vertices are found by the function
  * @see #findVertices(List)
  * @author jstrube

- * @version $Id: ZvTop.java,v 1.25 2006/01/31 23:34:34 jstrube Exp $

+ * @version $Id: ZvTop.java,v 1.26 2006/05/22 07:56:42 jstrube Exp $

  */
 public class ZvTop {
     /**

@@ -192,13 +192,13 @@

 //        System.out.printf("isResolvedFromMap: %d\tunresolvedMaximaMap: %d\n",
 //                isResolvedFromMap.size(), unresolvedMaximaMap.size());
 //        System.out.println("ZvMaxima");

-        for (ZvMaximum iMax : unresolvedMaximaMap.keySet()) {

+//        for (ZvMaximum iMax : unresolvedMaximaMap.keySet()) {

 //            System.out.println(iMax);
 //            System.out.printf("Is resolved from %d other Maxima\n",
 //                    isResolvedFromMap.get(iMax).size());
 //            System.out.printf("Is unresolved from %d other Maxima\n",
 //                    unresolvedMaximaMap.get(iMax).size());

-        }

+//        }

 //        System.out.println("done assignResolution");
     }
 

lcsim/src/org/lcsim/recon/vertexing/billoir

diff -u -r1.2 -r1.3
--- VertexFitter.java	28 Mar 2006 23:50:27 -0000	1.2
+++ VertexFitter.java	22 May 2006 07:56:43 -0000	1.3
@@ -3,7 +3,7 @@

  *
  * Created on March 25, 2006, 4:54 PM
  *

- * @version $Id: VertexFitter.java,v 1.2 2006/03/28 23:50:27 jstrube Exp $

+ * @version $Id: VertexFitter.java,v 1.3 2006/05/22 07:56:43 jstrube Exp $

  */
 
 package org.lcsim.recon.vertexing.billoir;

@@ -17,5 +17,7 @@

  * @author jstrube
  */
 public interface VertexFitter {

+    // better have an enumset of possible constraints
+    // or better even some kind of map for the constraints

     public Vertex fit(List<Track> tracks, SpacePoint initialPosition, boolean withBeamConstraint);
 }