Changeset 12000 for trunk/psLib/src/imageops/psImageConvolve.c

Timestamp:

Feb 22, 2007, 12:36:21 PM (19 years ago)

Author:

Paul Price

Message:

Generated kernel should be relative to the LAST data point (for OTA
images, this is the point at which it is read out).

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-02-22 22:12:36 $
+/// @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-02-22 22:36:21 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -125 +125 @@
     int xMin, xMax, yMin, yMax;         // Range of values for kernel
     int xLast, yLast;                   // Last location, for relative shifts
+    int x0, y0;                         // Final location; everything is relative to this
     xLast = xMin = xMax = xShifts->data.S32[0];
     yLast = yMin = yMax = yShifts->data.S32[0];
-    float tSum = tShifts->data.F32[0];   // Sum of the times
+    x0 = xShifts->data.S32[num - 1];
+    y0 = yShifts->data.S32[num - 1];
+    float tSum = tShifts->data.F32[num];   // Sum of the times
     for (long i = 1; i < num; i++) {
-        int x = xShifts->data.S32[i];    // x position in kernel
-        int y = yShifts->data.S32[i];    // y position in kernel
+        int x = xShifts->data.S32[i] - x0; // x position in kernel
+        int y = yShifts->data.S32[i] - y0; // y position in kernel
         if (xyRelative) {
             x += xLast;
@@ -169 +172 @@
     float tLast = 0.0;                  // Last value for t
     for (int i = 0; i < num; i++) {
-        int x = xShifts->data.S32[i];    // x position in kernel
-        int y = yShifts->data.S32[i];    // y position in kernel
+        int x = xShifts->data.S32[i] - x0; // x position in kernel
+        int y = yShifts->data.S32[i] - y0; // y position in kernel
         if (xyRelative) {
             x += xLast;