Changeset 34442 for branches/czw_branch/20120906/pswarp/src/pswarpTransformTile.c

Timestamp:

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

Author:

watersc1

Message:

Still doesn't work correctly. I've simplified and corrected the problems I was having before, but I still have residuals of ~50 pixels in the warped background model relative to the science warp. I'm beginning to think that there's some issue with the interpolated background model, and that it's not quite the correct size? That's pretty much all I can think of at this point.

File:

• branches/czw_branch/20120906/pswarp/src/pswarpTransformTile.c (modified) (5 diffs)

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

@@ -83 +83 @@
     // Iterate over the output image pixels (parent frame)
     long goodPixels = 0;                ///< Number of input pixels landing on the output image
+    psTrace("pswarp",3,"Size: %d %d\n",xMax,yMax);
     for (int y = yMin; y < yMax; y++) {
         for (int x = xMin; x < xMax; x++) {
+/*        if ((x == 931)||(x == 717)||(x == 924)) { */
+/* /\*      if ((y == 1348)||(y == 1249)||(y == 1081)) { *\/ */
+/* /\*        fprintf(stderr,"BEcause: %d %d [%d %d %d %d]\n",x,y,yMin,yMax,xMin,xMax); *\/ */
+/* /\*      } *\/ */
+/*        } */
+            if (((x == 931)&&(y == 1348))||
+                ((x == 717)&&(y == 1249))||
+                ((x == 924)&&(y == 1081))) {
+              psTrace("pswarp",3,"TT: A\n");
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+
+            }
 
             // Only transform those pixels requested
@@ -90 +103 @@
                 continue;
             }
+            if (((x == 931)&&(y == 1348))||
+                ((x == 717)&&(y == 1249))||
+                ((x == 924)&&(y == 1081))) {
+              psTrace("pswarp",3,"TT: B\n");
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+
+            }
 
             // pswarpMapApply converts the output coordinate (x,y) to the input coordinate.
@@ -95 +115 @@
             double xIn, yIn;            // Input pixel coordinates
             pswarpMapApply(&xIn, &yIn, map, x + 0.5, y + 0.5);
+            if (((x == 931)&&(y == 1348))||
+                ((x == 717)&&(y == 1249))||
+                ((x == 924)&&(y == 1081))) {
+              psTrace("pswarp",3,"TT: Ct\n");
+              psTrace("pswarp",3,"TT: %d %d %d %d %g %g %d %d\n",xMin,xMax,yMin,yMax,xIn,yIn,inNumCols,inNumRows);
+
+            }
+
             if (xIn < 0 || xIn >= inNumCols || yIn < 0 || yIn >= inNumRows) {
                 continue;
             }
+            if (((x == 931)&&(y == 1348))||
+                ((x == 717)&&(y == 1249))||
+                ((x == 924)&&(y == 1081))) {
+              psTrace("pswarp",3,"TT: C\n");
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+
+            }
 
             // psImagePixelInterpolate determines the value at pixel coordinate (x,y) in child coordinates
@@ -109 +144 @@
             int xOut = x - outCol0, yOut = y - outRow0; ///< Position on output image
 
+            if ((xIn >= args->interp->image->numCols - 1)||
+                (yIn >= args->interp->image->numRows - 1)) {
+              imageValue = NAN;
+            }
             if (outImageData) {
                 outImageData[yOut][xOut] = imageValue * jacobian;
@@ -120 +159 @@
 
             goodPixels++;
+
+            if ((x == 931)||(x == 717)||(x == 924)) {
+              if ((y == 1348)||(y == 1249)||(y == 1081)) {
+              psTrace("pswarp",3,"TT: %d %d %g %g %d %d %g %g (%g) %ld %g %g %g %g\n",x,y,xIn,yIn,xOut,yOut,imageValue,jacobian,
+                      args->input->image->data.F32[(int) yIn][(int) xIn],(long) args->interp,
+                      0.0,0.0,0.0,0.0);
+/*                    inImage->data.F32[(int) yIn][(int) xIn], */
+/*                    inImage->data.F32[(int) yIn+1][(int) xIn], */
+/*                    inImage->data.F32[(int) yIn+1][(int) xIn+1], */
+/*                    inImage->data.F32[(int) yIn][(int) xIn+1]); */
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+              }
+            }
+            
+            if (((xOut == 931)&&(yOut == 1348))||
+                ((xOut == 717)&&(yOut == 1249))||
+                ((xOut == 924)&&(yOut == 1081))) {
+              psTrace("pswarp",3,"TT: %d %d %g %g %d %d %g %g (%g) %ld %g %g %g %g\n",x,y,xIn,yIn,xOut,yOut,imageValue,jacobian,
+                      args->input->image->data.F32[(int) yIn][(int) xIn],(long) args->interp,
+                                      0.0,0.0,0.0,0.0);
+/*                    inImage->data.F32[(int) yIn][(int) xIn], */
+/*                    inImage->data.F32[(int) yIn+1][(int) xIn], */
+/*                    inImage->data.F32[(int) yIn+1][(int) xIn+1], */
+/*                    inImage->data.F32[(int) yIn][(int) xIn+1]); */
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+
+            }
+            if ((xOut ==  443)&&(yOut == 659)) {
+              psTrace("pswarp",3,"TT: %d %d %g %g %d %d %g %g (%g) %ld\n",x,y,xIn,yIn,xOut,yOut,imageValue,jacobian,
+                      args->input->image->data.F32[(int) yIn][(int) xIn],(long) args->interp);
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+
+            }
+            if ((xOut ==  524)&&(yOut == 576)) {
+              psTrace("pswarp",3,"TT: %d %d %g %g %d %d %g %g (%g) %ld\n",x,y,xIn,yIn,xOut,yOut,imageValue,jacobian,
+                      args->input->image->data.F32[(int) yIn][(int) xIn],(long) args->interp);
+              psTrace("pswarp",3,"TT: %d %d %d %d\n",xMin,xMax,yMin,yMax);
+              
+            }
         }
     }