Index: trunk/psModules/src/objects/pmPeaks.h
===================================================================
--- trunk/psModules/src/objects/pmPeaks.h	(revision 29004)
+++ trunk/psModules/src/objects/pmPeaks.h	(revision 31153)
@@ -35,4 +35,5 @@
     PM_PEAK_EDGE,                       ///< Peak on edge.
     PM_PEAK_FLAT,                       ///< Peak has equal-value neighbors.
+    PM_PEAK_SUSPECT_SATURATION,         ///< Peak is probably saturated
     PM_PEAK_UNDEF                       ///< Undefined.
 } pmPeakType;
@@ -45,4 +46,12 @@
  *  associated with the source:
  *
+ *  There are 3 values which define the amplitude of the peak and which may be used to sort the
+ *  peaks: 
+ *  * detValue - the peak in the detection image (nominally, the S/N)
+ *  * rawFlux - the peak in the unsmoothed image
+ *  * smoothFlux - the peak in the smoothed image
+ * 
+ *  For a given image, peaks do necesarily not have the same sequence for these three values.
+ *  Depending on the analysis, it may make sense to sort by one or the other of these values
  */
 typedef struct
@@ -55,7 +64,10 @@
     float dx;                           ///< bicube fit error on peak coord (x)
     float dy;                           ///< bicube fit error on peak coord (y)
-    float value;                        ///< level in detection image
-    float flux;                         ///< level in unsmoothed sci image
-    float SN;                           ///< S/N implied by detection level
+    float detValue;                     ///< peak flux in detection image (= S/N)
+    float rawFlux;                      ///< peak flux in unsmoothed signal image
+    float rawFluxStdev;                 ///< peak stdev in unsmoothed signal image
+    float smoothFlux;                   ///< peak flux in smoothed signal image
+    float smoothFluxStdev;              ///< peak stdev in smoothed signal image
+    // float SNestimated;                  ///< S/N estimated from the detection image
     bool assigned;                      ///< is peak assigned to a source?
     pmPeakType type;                    ///< Description of peak.
@@ -136,9 +148,10 @@
 );
 
-int pmPeaksCompareAscend (const void **a, const void **b);
-int pmPeaksCompareDescend (const void **a, const void **b);
-
-int pmPeakSortBySN (const void **a, const void **b);
-int pmPeakSortByY (const void **a, const void **b);
+int pmPeaksSortByDetValueAscend (const void **a, const void **b);
+int pmPeaksSortByDetValueDescend (const void **a, const void **b);
+int pmPeaksSortByRawFluxAscend (const void **a, const void **b);
+int pmPeaksSortByRawFluxDescend (const void **a, const void **b);
+int pmPeaksSortBySmoothFluxAscend (const void **a, const void **b);
+int pmPeaksSortBySmoothFluxDescend (const void **a, const void **b);
 
 /// @}