lcsim/test/org/lcsim/util/swim

diff -u -r1.2 -r1.3
--- HelixTest.java	22 Aug 2005 17:51:47 -0000	1.2
+++ HelixTest.java	23 Aug 2005 05:40:46 -0000	1.3
@@ -10,7 +10,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: HelixTest.java,v 1.2 2005/08/22 17:51:47 tonyj Exp $

+ * @version $Id: HelixTest.java,v 1.3 2005/08/23 05:40:46 jstrube Exp $

  */
 public class HelixTest extends TestCase
 {

@@ -42,12 +42,12 @@

       assertTrue(Double.isNaN(circle.getDistanceToInfiniteCylinder(0)));     
       assertEquals(0,circle.getDistanceToInfiniteCylinder(1),1e-14);     
       

-      System.out.println(circle.getDOCA(new BasicHep3Vector(-.5, 0,0)));
-      System.out.println(circle.getDOCA(new BasicHep3Vector(.5, 0,0)));
-      System.out.println(circle.getDOCA(new BasicHep3Vector(0,.5,0)));
-      System.out.println(circle.getDOCA(new BasicHep3Vector(0,-.5,0)));
-      System.out.println(circle.getDOCA(new BasicHep3Vector(0,.5,1)));
-      System.out.println(circle.getDOCA(new BasicHep3Vector(0,-.5,1)));

+      System.out.println(circle.getDistanceFromHelixToPoint(new BasicHep3Vector(-.5, 0,0)));
+      System.out.println(circle.getDistanceFromHelixToPoint(new BasicHep3Vector(.5, 0,0)));
+      System.out.println(circle.getDistanceFromHelixToPoint(new BasicHep3Vector(0,.5,0)));
+      System.out.println(circle.getDistanceFromHelixToPoint(new BasicHep3Vector(0,-.5,0)));
+      System.out.println(circle.getDistanceFromHelixToPoint(new BasicHep3Vector(0,.5,1)));
+      System.out.println(circle.getDistanceFromHelixToPoint(new BasicHep3Vector(0,-.5,1)));

    }
    public void testCircle2()
    {

@@ -133,7 +133,24 @@

       assertEquals(Math.sqrt(2)/2,xy.rmsY(),1e-14);
       aida.saveAs("helix.aida");    
    }

-

+   
+   public void testGetDistanceToPoint() {
+       Hep3Vector origin = new BasicHep3Vector(0,0,0);
+       double radius = 1;
+       double phi = Math.PI/2;
+       double lambda = Math.PI/4;
+       Helix helix = new Helix(origin, radius, phi, lambda);
+       
+       assertEquals(helix.getDistanceFromHelixToPoint(origin), 0, 1e-14);
+       Hep3Vector pointOnHelix = helix.getPointAtDistance(0.77);
+       System.out.println(pointOnHelix);
+       // assertEquals(helix.getDistanceFromHelixToPoint(pointOnHelix), 0, 1e-14);
+       Hep3Vector newPoint = new BasicHep3Vector(0, 1.0, 0);
+       assertEquals(helix.getDistanceFromHelixToPoint(newPoint), 1.0, 1e-14);
+       Hep3Vector centerOfCircle = new BasicHep3Vector(1, 0, 0);
+       // assertEquals(helix.getDistanceFromHelixToPoint(centerOfCircle), radius, 1e-14);
+   }
+   

    private void assertEquals(Hep3Vector v1, Hep3Vector v2)
    {
       assertEquals(v1.x(),v2.x(), 1e-14);