Changeset 25754 for trunk/psModules/src/objects/pmPeaks.c

Timestamp:

Oct 2, 2009, 3:11:32 PM (17 years ago)

Author:

eugene

Message:

check in changes from genes development branch : extensive changes to moments calculation, psf model generation, aperture residuals

File:

• trunk/psModules/src/objects/pmPeaks.c (modified) (2 diffs)

trunk/psModules/src/objects/pmPeaks.c

@@ -60 +60 @@
     // if min point is too deviant, use the peak value
     // XXX need to calculate dx, dy correctly
+    // 0.5 PIX: peaks are calculated using the pixel index and converted here to pixel coords
     if ((fabs(min.x) < 1.5) && (fabs(min.y) < 1.5)) {
-        peak->xf = min.x + ix + image->col0;
-        peak->yf = min.y + iy + image->row0;
+        peak->xf = min.x + ix + image->col0 + 0.5;
+        peak->yf = min.y + iy + image->row0 + 0.5;
 
         // These errors are fractional errors, and should be scaled by the 
@@ -73 +74 @@
         peak->yf = PS_MAX (PS_MIN (peak->yf, image->numRows - 1), image->row0);
     } else {
-        peak->xf = ix;
-        peak->yf = iy;
+        peak->xf = ix + 0.5;
+        peak->yf = iy + 0.5; 
         peak->dx = NAN;
         peak->dy = NAN;