Warp fix with temporary print statements

Author: cmsaunders

src/math/warpExposure.cc

@@ -587,6 +587,9 @@ int warpImage(DestImageT &destImage, SrcImageT const &srcImage,
                 int endCol = edgeColList[colBand];
                 yDeltaSrcPosList[colBand] =
                         (bottomSrcPosList[colBand] - srcPosView[endCol]) * interpInvHeight;
+                if ((!std::isnan(yDeltaSrcPosList[colBand][0])) && (endRow < 20) && (endCol < 500)) {
+                    std::cerr << "not nan " << endRow << " " << endCol << yDeltaSrcPosList[colBand] << std::endl;
+                }
             }
 
             for (int row = prevEndRow + 1; row <= endRow; ++row) {
@@ -604,10 +607,25 @@ int warpImage(DestImageT &destImage, SrcImageT const &srcImage,
                     lsst::geom::Point2D leftSrcPos = srcPosView[prevEndCol];
                     lsst::geom::Point2D rightSrcPos = srcPosView[endCol] + yDeltaSrcPosList[colBand];
                     lsst::geom::Extent2D xDeltaSrcPos = (rightSrcPos - leftSrcPos) * invWidthList[colBand];
+                    if (!std::isnan(bottomSrcPosList[colBand][0])) {
+                            if ((row < 30) && (row > 9) && (colBand < 50)) {
+                                std::cerr << "prev col: " << prevEndCol << " " << srcPosView[prevEndCol] << std::endl;
+                                std::cerr << row << " " << colBand << "  " << bottomSrcPosList[colBand] << " " <<  srcPosView[endCol] << " " << yDeltaSrcPosList[colBand] << "  " << xDeltaSrcPos << std::endl;
+                            }
+                        }
 
                     for (int col = prevEndCol + 1; col <= endCol; ++col, ++destXIter) {
                         lsst::geom::Point2D leftSrcPos = srcPosView[col - 1];
-                        lsst::geom::Point2D srcPos = leftSrcPos + xDeltaSrcPos;
+                        lsst::geom::Point2D srcPos;
+                        if (col == endCol) {
+                            if ((row < 30) && (row > 9) && (colBand < 50)) {
+                                std::cerr << "resetting at endCol: " << row << " " << col << " " << leftSrcPos + xDeltaSrcPos << " " << rightSrcPos << std::endl;
+                            }
+                            srcPos = rightSrcPos;
+                        }
+                        else {
+                            srcPos = leftSrcPos + xDeltaSrcPos;
+                        }
                         double relativeArea = computeRelativeArea(srcPos, leftSrcPos, srcPosView[col]);
 
                         srcPosView[col] = srcPos;
@@ -618,6 +636,17 @@ int warpImage(DestImageT &destImage, SrcImageT const &srcImage,
                             ++numGoodPixels;
                         }
                     }  // for col
+                    if (row == endRow) {
+                        // Set srcPosView to correct bottowSrcPosList to override nans:
+                        if ((row < 30) && (row >= 9) && (colBand < 50)) {
+                            std::cerr << "before reset: " << endRow << " " << colBand << " " <<  srcPosView[endCol] << " "<<  bottomSrcPosList[colBand] << std::endl;
+                        }
+                        srcPosView[endCol] = bottomSrcPosList[colBand];
+                        if ((row < 30) && (row >= 9)  && (colBand < 50)){
+                            std::cerr << "after reset: " << srcPosView[endCol] << " "<<  bottomSrcPosList[colBand] << std::endl;
+                        }
+                        
+                    }
                 }      // for col band
             }          // for row
         }              // while next row band