Changeset 11159

Timestamp:

Jan 18, 2007, 6:36:55 PM (19 years ago)

Author:

magnier

Message:

adding SN and flux elements to pmPeak, changing counts to value

Location:

trunk/psModules/src/objects

Files:

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

trunk/psModules/src/objects/pmPeaks.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-17 23:00:31 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-19 04:36:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
 pmPeak *pmPeakAlloc(psS32 x,
                     psS32 y,
-                    psF32 counts,
+                    psF32 value,
                     pmPeakType type)
 {
@@ -131 +131 @@
     tmp->x = x;
     tmp->y = y;
-    tmp->counts = counts;
+    tmp->value = value;
+    tmp->flux = 0;
+    tmp->SN = 0;
+
     tmp->type = type;
 
@@ -154 +157 @@
     psF32 diff;
 
-    diff = A->counts - B->counts;
+    diff = A->value - B->value;
     if (diff < FLT_EPSILON) {
         psTrace("psModules.objects", 3, "---- %s(-1) end ----\n", __func__);
@@ -175 +178 @@
     psF32 diff;
 
-    diff = A->counts - B->counts;
+    diff = A->value - B->value;
     if (diff < FLT_EPSILON) {
         psTrace("psModules.objects", 3, "---- %s(+1) end ----\n", __func__);
@@ -301 +304 @@
 XXX: This does not work if image has either a single row, or a single column.
  
-XXX: In the output psArray elements, should we use the image row/column offsets?
-     Currently, we do not.
-XXX EAM : this function needs to return peaks in *parent* coords
- 
-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
- 
-*****************************************************************************/
-psArray *pmFindImagePeaks(const psImage *image,
-                          psF32 threshold)
+*****************************************************************************/
+psArray *pmFindImagePeaks(const psImage *image, psF32 threshold)
 {
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
@@ -532 +525 @@
     while (tmpListElem != NULL) {
         pmPeak *tmpPeak = (pmPeak *) tmpListElem->data;
-        if ((tmpPeak->counts > maxValue) ||
+        if ((tmpPeak->value > maxValue) ||
                 (true == isItInThisRegion(valid, tmpPeak->x, tmpPeak->y))) {
             psListRemoveData(peaks, (psPtr) tmpPeak);
@@ -562 +555 @@
     for (int i = 0; i < peaks->n; i++) {
         pmPeak *tmpPeak = (pmPeak *) peaks->data[i];
-        if (tmpPeak->counts > maxValue)
+        if (tmpPeak->value > maxValue)
             continue;
         if (isItInThisRegion(valid, tmpPeak->x, tmpPeak->y))

trunk/psModules/src/objects/pmPeaks.h

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-07 09:07:42 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-19 04:36:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
     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.
+    float value;                        ///< level in detection image
+    float flux;                         ///< level in unsmoothed sci image
+    float SN;                           ///< S/N implied by detection level
+    pmPeakType type;   ///< Description of peak.
 }
 pmPeak;