Changeset 9881 for trunk/psModules/src/objects

Timestamp:

Nov 6, 2006, 11:07:42 PM (20 years ago)

Author:

magnier

Message:

adding prep code to apply psImageBicubeFit to peaks in pmPeaks (ie, to smoothed image); not functioning yet

Location:

trunk/psModules/src/objects

Files:

• pmPeaks.c (modified) (3 diffs)
• pmPeaks.h (modified) (2 diffs)

trunk/psModules/src/objects/pmPeaks.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:55:05 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-07 09:07:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -286 +286 @@
 XXX: Merge with CVS 1.20.  This had the proper code for images with a single
 row or column.
+ 
+XXX this does not use the weight or mask information
  
 *****************************************************************************/
@@ -420 +422 @@
 
                         list = myListAddPeak(list, row + row0, col + col0, image->data.F32[row][col], myType);
+
+                        # if (0)
+
+                            psPolynomial2D *bicube = psImageBicubeFit (inSource->pixels, ix, iy);
+                        psPlane min = psImageBicubeMin (bicube);
+                        peak->xf = min.x;
+                        peak->yf = min.y;
+                        # endif
+
                     }
                 }

trunk/psModules/src/objects/pmPeaks.h

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-03 01:02:08 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-07 09:07:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
     int x;                              ///< X-coordinate of peak pixel.
     int y;                              ///< Y-coordinate of peak pixel.
+    float xf;                           ///< bicube fit to peak coord (x)
+    float yf;                           ///< bicube fit to peak coord (y)
     float counts;                       ///< Value of peak pixel (above sky?).
     pmPeakType type;                   ///< Description of peak.