diff -u -r1.3 -r1.4
--- TrackerHit.java	22 Feb 2005 06:37:41 -0000	1.3
+++ TrackerHit.java	8 Nov 2005 20:17:39 -0000	1.4
@@ -1,9 +1,3 @@

-// AID-GENERATED
-// =========================================================================
-// This class was generated by AID - Abstract Interface Definition
-// DO NOT MODIFY, but use the org.freehep.aid.Aid utility to regenerate it.
-// =========================================================================
-

 package org.lcsim.event;
 
 import java.util.List;

@@ -11,7 +5,7 @@

 /** A generic tracker hit to be used by pattern recognition.
  *
  * @author gaede

- * @version $Id: TrackerHit.java,v 1.3 2005/02/22 06:37:41 tonyj Exp $

+ * @version $Id: TrackerHit.java,v 1.4 2005/11/08 20:17:39 tonyj Exp $

  */
 
 public interface TrackerHit

diff -u -r1.10 -r1.11
--- HelixSwimmer.java	28 Oct 2005 19:59:14 -0000	1.10
+++ HelixSwimmer.java	8 Nov 2005 20:17:39 -0000	1.11
@@ -12,7 +12,7 @@

  * A simple helix smimmer for use in org.lcsim. Uses standard lcsim units
  * Tesla, mm, GeV. This swimmer works for charged and neutral tracks.
  * @author tonyj

- * @version $Id: HelixSwimmer.java,v 1.10 2005/10/28 19:59:14 jstrube Exp $

+ * @version $Id: HelixSwimmer.java,v 1.11 2005/11/08 20:17:39 tonyj Exp $

  */
 public class HelixSwimmer
 {

@@ -59,10 +59,8 @@

       double phi = t.getTrackParameter(1);
       double lambda = Math.atan(t.getTrackParameter(4));
       double d0 = t.getTrackParameter(0);

-      int iCharge = (int) Math.signum(omega);
-      double halfpi = Math.PI/2;

       double[] ref = t.getReferencePoint();

-      Hep3Vector origin = new BasicHep3Vector( ref[0] + d0 * Math.cos(phi + iCharge * halfpi), ref[1] + d0 * Math.sin(phi + iCharge * halfpi), ref[2] + z0);

+      Hep3Vector origin = new BasicHep3Vector( ref[0] -d0 * Math.sin(phi), ref[1] + d0 * Math.cos(phi), ref[2] + z0);

       trajectory = new Helix(origin,1/omega,phi,lambda);
    }
    public Hep3Vector getPointAtDistance(double alpha)

diff -u -r1.3 -r1.4
--- HelixSwimTest.java	23 Aug 2005 05:41:08 -0000	1.3
+++ HelixSwimTest.java	8 Nov 2005 20:17:40 -0000	1.4
@@ -6,7 +6,7 @@

 import org.lcsim.util.aida.AIDA;
 
 /**

- *

+ * This tests an obsolete class and should be removed soon.

  * @author tonyj
  */
 public class HelixSwimTest extends TestCase

@@ -45,14 +45,14 @@

       
       alpha = Math.sqrt(3);
       point  = swim.getPointAtLength(alpha);  

-      System.out.println(point);

+      //System.out.println(point);

       
       double radius = swim.getRc();

-      System.out.println("radius="+radius);

+      //System.out.println("radius="+radius);

       alpha = Math.PI * 2 * radius;
       //swim.setTrack(new double[]{1,1,1},origin.getCartesianArray(), 1);
       point  = swim.getPointAtLength(alpha);

-      System.out.println(point);   

+      //System.out.println(point);   

    }
    public void test3() throws IOException
    {

diff -u -r1.11 -r1.12
--- HelixTest.java	28 Oct 2005 19:56:59 -0000	1.11
+++ HelixTest.java	8 Nov 2005 20:17:40 -0000	1.12
@@ -12,7 +12,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: HelixTest.java,v 1.11 2005/10/28 19:56:59 jstrube Exp $

+ * @version $Id: HelixTest.java,v 1.12 2005/11/08 20:17:40 tonyj Exp $

  */
 public class HelixTest extends TestCase
 {

@@ -38,6 +38,8 @@

       assertEquals(origin, circle.getPointAtDistance(0));
       assertEquals(origin, circle.getPointAtDistance(radius*Math.PI*2));
       assertEquals(new BasicHep3Vector(-1,0,0), circle.getPointAtDistance(radius*Math.PI));

+      // I'm not really convinced this is right, but everything seems to work - tonyj
+      assertEquals(new BasicHep3Vector(0,-1,0), circle.getPointAtDistance(radius*Math.PI/2));

       
       assertTrue(Double.isInfinite(circle.getDistanceToZPlane(1)));
       assertTrue(Double.isNaN(circle.getDistanceToInfiniteCylinder(2)));

@@ -56,7 +58,8 @@

       assertEquals(origin, circle.getPointAtDistance(0));
       assertEquals(origin, circle.getPointAtDistance(radius*Math.PI*2));
       assertEquals(new BasicHep3Vector(2,0,0), circle.getPointAtDistance(radius*Math.PI));

-      

+      assertEquals(new BasicHep3Vector(1,1,0), circle.getPointAtDistance(radius*Math.PI/2));
+                  

       assertTrue(Double.isInfinite(circle.getDistanceToZPlane(1)));
       assertTrue(Double.isNaN(circle.getDistanceToInfiniteCylinder(3*radius)));
       assertEquals(radius*Math.PI,circle.getDistanceToInfiniteCylinder(2*radius),1e-14);