Changeset 10825 for trunk/psModules/src/astrom/pmAstrometryDistortion.c

Timestamp:

Dec 22, 2006, 11:23:06 AM (20 years ago)

Author:

magnier

Message:

cleaned up WCS conversions, added bilevel astrometry read/write functions

File:

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

trunk/psModules/src/astrom/pmAstrometryDistortion.c

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-12-10 02:06:47 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-12-22 21:23:06 $
 *
 *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -187 +187 @@
     for (int i = 0; i < fpa->toTPA->x->nX; i++) {
         for (int j = 0; j < fpa->toTPA->x->nY; j++) {
-            if (fpa->toTPA->x->mask[i][j][0][0]) {
+            if (fpa->toTPA->x->mask[i][j]) {
                 localX->mask[i-1][j] = 1;
                 localY->mask[i][j-1] = 1;
@@ -203 +203 @@
 
     // update fpa->toTP distortion terms
-    fpa->toTPA->x->coeff[0][0][0][0] = 0;
+    fpa->toTPA->x->coeff[0][0] = 0;
     for (int i = 1; i < fpa->toTPA->x->nX; i++) {
-        if (!fpa->toTPA->x->mask[i][0][0][0]) {
-            fpa->toTPA->x->coeff[i][0][0][0] = localX->coeff[i-1][0] / i;
+        if (!fpa->toTPA->x->mask[i][0]) {
+            fpa->toTPA->x->coeff[i][0] = localX->coeff[i-1][0] / i;
         }
     }
     for (int j = 1; j < fpa->toTPA->x->nY; j++) {
-        if (!fpa->toTPA->x->mask[0][j][0][0]) {
-            fpa->toTPA->x->coeff[0][j][0][0] = localY->coeff[0][j-1] / j;
+        if (!fpa->toTPA->x->mask[0][j]) {
+            fpa->toTPA->x->coeff[0][j] = localY->coeff[0][j-1] / j;
         }
     }
     for (int i = 1; i < fpa->toTPA->x->nX; i++) {
         for (int j = 1; j < fpa->toTPA->x->nY; j++) {
-            if (!fpa->toTPA->x->mask[i][j][0][0]) {
-                fpa->toTPA->x->coeff[i][j][0][0] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
+            if (!fpa->toTPA->x->mask[i][j]) {
+                fpa->toTPA->x->coeff[i][j] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
             }
         }
@@ -232 +232 @@
     for (int i = 0; i < fpa->toTPA->y->nX; i++) {
         for (int j = 0; j < fpa->toTPA->y->nY; j++) {
-            if (fpa->toTPA->y->mask[i][j][0][0]) {
+            if (fpa->toTPA->y->mask[i][j]) {
                 localX->mask[i-1][j] = 1;
                 localY->mask[i][j-1] = 1;
@@ -259 +259 @@
 
     // update fpa->toTP distortion terms
-    fpa->toTPA->y->coeff[0][0][0][0] = 0;
+    fpa->toTPA->y->coeff[0][0] = 0;
     for (int i = 1; i < fpa->toTPA->y->nX; i++) {
-        if (!fpa->toTPA->y->mask[i][0][0][0]) {
-            fpa->toTPA->y->coeff[i][0][0][0] = localX->coeff[i-1][0] / i;
+        if (!fpa->toTPA->y->mask[i][0]) {
+            fpa->toTPA->y->coeff[i][0] = localX->coeff[i-1][0] / i;
         }
     }
     for (int j = 1; j < fpa->toTPA->y->nY; j++) {
-        if (!fpa->toTPA->y->mask[0][j][0][0]) {
-            fpa->toTPA->y->coeff[0][j][0][0] = localY->coeff[0][j-1] / j;
+        if (!fpa->toTPA->y->mask[0][j]) {
+            fpa->toTPA->y->coeff[0][j] = localY->coeff[0][j-1] / j;
         }
     }
     for (int i = 1; i < fpa->toTPA->y->nX; i++) {
         for (int j = 1; j < fpa->toTPA->y->nY; j++) {
-            if (!fpa->toTPA->y->mask[i][j][0][0]) {
-                fpa->toTPA->y->coeff[i][j][0][0] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
+            if (!fpa->toTPA->y->mask[i][j]) {
+                fpa->toTPA->y->coeff[i][j] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
             }
         }