Changeset 10643

Timestamp:

Dec 11, 2006, 10:00:44 PM (20 years ago)

Author:

magnier

Message:

fixed fit order inconsistencies

File:

• trunk/psModules/src/astrom/pmAstrometryWCS.c (modified) (3 diffs)

trunk/psModules/src/astrom/pmAstrometryWCS.c

@@ -7 +7 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-11 16:55:06 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-12 08:00:44 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -151 +151 @@
         return NULL;
     }
-    if (isPoly && !pcKeys) {
-        psError(PS_ERR_UNKNOWN, true, "polynomial terms defined, but missing PC00i00j WCS terms");
-        return NULL;
+    if (isPoly) {
+        if (!pcKeys) {
+            psError(PS_ERR_UNKNOWN, true, "polynomial terms defined, but missing PC00i00j WCS terms");
+            return NULL;
+        }
         if (fitOrder == 0)
             fitOrder = 1;
@@ -201 +203 @@
             // Elixir-style polynomial terms
             // XXX currently, Elixir/DVO cannot accept mixed orders
-            for (int i = 0; i < fitOrder; i++) {
-                for (int j = 0; j < fitOrder; j++) {
+            for (int i = 0; i <= fitOrder; i++) {
+                for (int j = 0; j <= fitOrder; j++) {
                     if (i + j < 2)
                         continue;
                     if (i + j > fitOrder)
                         continue;
-                    sprintf (name, "PCA1dX%1dY%1d", i, j);
+                    sprintf (name, "PCA1X%1dY%1d", i, j);
                     wcs->trans->x->coeff[i][j] = pow(wcs->cdelt1, i) * pow(wcs->cdelt2, j) * psMetadataLookupF32 (&status, header, name);
-                    sprintf (name, "PCA2dX%1dY%1d", i, j);
+                    sprintf (name, "PCA2X%1dY%1d", i, j);
                     wcs->trans->y->coeff[i][j] = pow(wcs->cdelt1, i) * pow(wcs->cdelt2, j) * psMetadataLookupF32 (&status, header, name);
                 }