Changeset 21536 for branches/cnb_branch_20090215/psModules/src/objects/pmPeaks.c

Timestamp:

Feb 19, 2009, 7:59:50 AM (17 years ago)

Author:

beaumont

Message:

Added visualizations to ppSub. Set up a single variable in pmVisual to control when plots are drawn.

File:

• branches/cnb_branch_20090215/psModules/src/objects/pmPeaks.c (modified) (7 diffs)

branches/cnb_branch_20090215/psModules/src/objects/pmPeaks.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-12-08 02:51:14 $
+ *  @version $Revision: 1.25.14.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-19 17:59:50 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 AddPeak(): A private function which allocates a psArray, if the peaks
 argument is NULL, otherwise it adds the peak to that array.
-XXX EAM : row,col now refer to image coords, NOT parent (since this is private) 
+XXX EAM : row,col now refer to image coords, NOT parent (since this is private)
 XXX EAM : now also calculates fractional peak positions from 3x3 bicube region
 *****************************************************************************/
@@ -63 +63 @@
         peak->xf = min.x + ix + image->col0;
         peak->yf = min.y + iy + image->row0;
-        peak->dx = NAN;
-        peak->dy = NAN;
-        
-        // xf,yf must land on image with 0 pixel border
-        peak->xf = PS_MAX (PS_MIN (peak->xf, image->numCols - 1), image->col0);
-        peak->yf = PS_MAX (PS_MIN (peak->yf, image->numRows - 1), image->row0);
+
+        // These errors are fractional errors, and should be scaled by the
+        // error on the peak pixel (see, eg, psphotFindPeaks)
+        peak->dx = min.xErr;
+        peak->dy = min.yErr;
+
+        // xf,yf must land on image with 0 pixel border
+        peak->xf = PS_MAX (PS_MIN (peak->xf, image->numCols - 1), image->col0);
+        peak->yf = PS_MAX (PS_MIN (peak->yf, image->numRows - 1), image->row0);
     } else {
         peak->xf = ix;
         peak->yf = iy;
-        peak->dx = NAN;
-        peak->dy = NAN;
+        peak->dx = NAN;
+        peak->dy = NAN;
     }
 
@@ -86 +89 @@
 getRowVectorFromImage(): a private function which simply returns a
 psVector containing the specified row of data from the psImage.
- 
+
 XXX: Is there a better way to do this?
 XXX EAM: does this really need to alloc a new vector???
@@ -245 +248 @@
 above the given threshold.  Returns a vector of type PS_TYPE_U32 containing
 the location (x value) of all peaks.
- 
+
 XXX: What types should be supported?  Only F32 is implemented.
- 
+
 XXX: We currently step through the input vector twice; once to determine the
 size of the output vector, then to set the values of the output vector.
@@ -253 +256 @@
 *****************************************************************************/
 psVector *pmPeaksInVector(const psVector *vector,
-                         psF32 threshold)
+                         psF32 threshold)
 {
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
@@ -347 +350 @@
 above the given threshold.  Returns a psArray containing location (x/y value)
 of all peaks.
- 
+
 XXX: I'm not convinced the peak type definition in the SDRS is mutually
 exclusive.  Some peaks can have multiple types.  Edges for sure.  Also, a
 digonal line with the same value at each point will have a peak for every
 point on that line.
- 
+
 XXX: This does not work if image has either a single row, or a single column.
- 
+
 The peak is returned in the image parent coordinates