Changeset 31153 for trunk/psModules/src/objects/pmFootprintAssignPeaks.c

Timestamp:

Apr 4, 2011, 1:04:41 PM (15 years ago)

Author:

eugene

Message:

updates to pmPeak to better distinguish peak flux versions; updates to visualization; add bits for substantial suspect masking; consolidate assignment of source position and flux based on peak, moments, etc; improve footprint culling process; fix PSF_QF and PSF_QF_PERFECT calculations; fix source model chisq values

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmFootprintAssignPeaks.c (modified) (3 diffs)

trunk/psModules

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

trunk/psModules/src/objects/pmFootprintAssignPeaks.c

@@ -46 +46 @@
      */
     psImage *ids = pmSetFootprintArrayIDs(footprints, true);
-    assert (ids != NULL);
-    assert (ids->type.type == PS_TYPE_S32);
-    const int row0 = ids->row0;
-    const int col0 = ids->col0;
-    const int numRows = ids->numRows;
-    const int numCols = ids->numCols;
+    if (ids) { assert (ids->type.type == PS_TYPE_S32); }
+    
+    const int row0 = ids ? ids->row0 : 0;
+    const int col0 = ids ? ids->col0 : 0;
+    const int numRows = ids ? ids->numRows : -1;
+    const int numCols = ids ? ids->numCols : -1;
 
     for (int i = 0; i < peaks->n; i++) {
@@ -58 +58 @@
         const int y = peak->y - row0;
         
-        assert (x >= 0 && x < numCols && y >= 0 && y < numRows);
-        int id = ids->data.S32[y][x - col0];
+        if (ids) { assert (x >= 0 && x < numCols && y >= 0 && y < numRows);}
+        int id = ids ? ids->data.S32[y][x - col0] : 0;
+        // XXX I think the '[x - col0]' above is just wrong (should be [x], but never gets triggerd.
 
         if (id == 0) {                  // peak isn't in a footprint, so make one for it
@@ -86 +87 @@
         if (fp->peaks->n == 1) continue;
 
-        fp->peaks = psArraySort(fp->peaks, pmPeakSortBySN);
+        // make sure the peaks are sorted in a way consistent with our cull process
+        if (PM_PEAKS_CULL_WITH_SMOOTHED_IMAGE) {
+            fp->peaks = psArraySort(fp->peaks, pmPeaksSortBySmoothFluxDescend);
+        } else {
+            fp->peaks = psArraySort(fp->peaks, pmPeaksSortByRawFluxDescend);
+        }
 
         // XXX check for an assert on duplicates (I don't think they can happen, but

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM