Changeset 34449 for branches/czw_branch/20120906/pswarp/src/pswarpLoop.c

Timestamp:

Sep 18, 2012, 6:10:35 PM (14 years ago)

Author:

watersc1

Message:

Update to ppSkycell to add a proper header and a proper WCS. Finally.

Fix WCS bug in pswarpLoop that was revealed when working on ppSkycell. Finally.

Changed psImagePixelManip to only copy finite pixel values. This is likely "slow" relative to the old version, and it looks like I'm getting some random default values. In any case, this fixes the NAN striping that was present in the ppSkycell outputs.

File:

• branches/czw_branch/20120906/pswarp/src/pswarpLoop.c (modified) (2 diffs)

branches/czw_branch/20120906/pswarp/src/pswarpLoop.c

@@ -713 +713 @@
         WCS->cdelt1 *= cd1f;
         WCS->cdelt2 *= cd2f;
-        WCS->crpix1 = WCS->crpix1 / cd1f + 46.0 / 400.0;
-        WCS->crpix2 = WCS->crpix2 / cd2f + 68.0 / 400.0;
+        WCS->crpix1 = WCS->crpix1 / cd1f;
+        WCS->crpix2 = WCS->crpix2 / cd2f;
 
         // WCS->trans->x->nX/nY
-        for (int q = 0; q < WCS->trans->x->nX; q++) {
-          for (int r = 0; r < WCS->trans->x->nY; r++) {
+        for (int q = 0; q <= WCS->trans->x->nX; q++) {
+          for (int r = 0; r <= WCS->trans->x->nY; r++) {
             fprintf(stderr,"%d %d %g\n",q,r,WCS->trans->x->coeff[q][r]);
             WCS->trans->x->coeff[q][r] *= pow(cd1f,q) * pow(cd2f,r);
@@ -724 +724 @@
           }
         }
-        for (int q = 0; q < WCS->trans->y->nX; q++) {
-          for (int r = 0; r < WCS->trans->y->nY; r++) {
+        for (int q = 0; q <= WCS->trans->y->nX; q++) {
+          for (int r = 0; r <= WCS->trans->y->nY; r++) {
             fprintf(stderr,"%d %d %g\n",q,r,WCS->trans->y->coeff[q][r]);
             WCS->trans->y->coeff[q][r] *= pow(cd1f,q) * pow(cd2f,r);