Changeset 10867

Timestamp:

Jan 1, 2007, 11:04:10 AM (19 years ago)

Author:

magnier

Message:

fixed convergence criterion

File:

• trunk/psModules/src/astrom/pmAstrometryUtils.c (modified) (5 diffs)

trunk/psModules/src/astrom/pmAstrometryUtils.c

@@ -7 +7 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-22 21:23:06 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-01 21:04:10 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -23 +23 @@
 // given a 2D transformation -- L(x,y),M(x,y) -- find the coordinates x,y
 // for which L,M = 0,0. tol is the allowed error on x,y.
-psPlane *psPlaneTransformGetCenter (psPlaneTransform *trans, float tol)
+psPlane *psPlaneTransformGetCenter (psPlaneTransform *trans, double tol)
 {
 
@@ -47 +47 @@
         * Xo,Yo are in pixels;
         */
-        float dPos = tol + 1;
-        for (int i = 0; (dPos > tol) && (i < 10); i++) {
+        double dPos = tol + 1;
+        for (int i = 0; (dPos > tol) && (i < 20); i++) {
             // NOTE: order for Alpha is: [y][x]
             Alpha->data.F32[0][0] = psPolynomial2DEval (XdX, Xo, Yo);
@@ -62 +62 @@
             Xo -= Beta->data.F32[0];
             Yo -= Beta->data.F32[1];
-            dPos = hypot(Xo,Yo);
+            dPos = hypot(Beta->data.F32[0], Beta->data.F32[1]);
         }
         psFree (Alpha);
@@ -79 +79 @@
 
 // convert a transformation L(x,y) to L'(x-xo,y-yo)
-psPlaneTransform *psPlaneTransformSetCenter (psPlaneTransform *output, psPlaneTransform *input, float Xo, float Yo)
+psPlaneTransform *psPlaneTransformSetCenter (psPlaneTransform *output, psPlaneTransform *input, double Xo, double Yo)
 {