Changeset 10775 for trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c

Timestamp:

Dec 15, 2006, 7:34:54 PM (20 years ago)

Author:

magnier

Message:

polynomial fits

File:

• trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c (modified) (3 diffs)

trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c

@@ -24 +24 @@
 int main (void)
 {
-    plan_tests(984);
+    plan_tests(1472);
 
     diag("pmAstromReadWCS tests compared with DVO coords routines");
@@ -474 +474 @@
 {
     diag("test the inversion of the non-linear polynomial for toFPA -> fromFPA in pmAstromReadWCS");
+    diag("note that the tolerance for these tests are rather loose");
+    diag("a 2nd order polynomial is not a great approximate to 1 over a 2nd order polynomial");
+    diag("unless the non-linear terms are quite small");
     psMemId id = psMemGetId();
 
@@ -533 +536 @@
             psPlaneTransformApply (bChip, chip->fromFPA, bFPA);
 
-            ok_float(aChip->x, bChip->x, "coordinate match: %f vs %f (delta = %f)", aChip->x, bChip->x, aChip->x - bChip->x);
-            ok_float(aChip->y, bChip->y, "coordinate match: %f vs %f (delta = %f)", aChip->y, bChip->y, aChip->y - bChip->y);
-
-            // ok_float(aFPA->x, bFPA->x, "coordinate match: %f vs %f (delta = %f)", aFPA->x, bFPA->x, aFPA->x - bFPA->x);
-            // ok_float(aFPA->y, bFPA->y, "coordinate match: %f vs %f (delta = %f)", aFPA->y, bFPA->y, aFPA->y - bFPA->y);
+            // calculate appropriate tol values as f(x,y)
+            ok_float_tol(aChip->x, bChip->x, 1.0, "coordinate match: %f vs %f (delta = %f)", aChip->x, bChip->x, aChip->x - bChip->x);
+            ok_float_tol(aChip->y, bChip->y, 1.0, "coordinate match: %f vs %f (delta = %f)", aChip->y, bChip->y, aChip->y - bChip->y);
+
+            ok_float(aFPA->x, bFPA->x, "coordinate match: %f vs %f (delta = %f)", aFPA->x, bFPA->x, aFPA->x - bFPA->x);
+            ok_float(aFPA->y, bFPA->y, "coordinate match: %f vs %f (delta = %f)", aFPA->y, bFPA->y, aFPA->y - bFPA->y);
 
             // in this example, TPA coordinates are 10 arcsec/mm; the tol. below represent 1nano-arcsec
-            // ok_float_tol(aTPA->x, bTPA->x, 1e-10, "coordinate match: %f vs %f (delta = %g)", aTPA->x, bTPA->x, aTPA->x - bTPA->x);
-            // ok_float_tol(aTPA->y, bTPA->y, 1e-10, "coordinate match: %f vs %f (delta = %g)", aTPA->y, bTPA->y, aTPA->y - bTPA->y);
+            ok_float_tol(aTPA->x, bTPA->x, 1e-10, "coordinate match: %f vs %f (delta = %g)", aTPA->x, bTPA->x, aTPA->x - bTPA->x);
+            ok_float_tol(aTPA->y, bTPA->y, 1e-10, "coordinate match: %f vs %f (delta = %g)", aTPA->y, bTPA->y, aTPA->y - bTPA->y);
         }
     }