Changeset 24951 for branches/czw_branch/cleanup/psphot/src/psphotDeblendSatstars.c

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• psphot/src/psphotDeblendSatstars.c (modified) (5 diffs)

branches/czw_branch/cleanup/psphot/src/psphotDeblendSatstars.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotDeblendSatstars (psArray *sources, psMetadata *recipe) {
+bool psphotDeblendSatstars (pmReadout *readout, psArray *sources, psMetadata *recipe) {
 
     int N;
@@ -9 +9 @@
 
     int Nblend = 0;
-    float SAT_TEST_LEVEL = 50000;
     float SAT_MIN_RADIUS = 5.0;
+
+    bool status;
+    pmCell *cell = readout->parent;
+    float SATURATION = 0.75*psMetadataLookupF32 (&status, cell->concepts, "CELL.SATURATION");
+    float SAT_TEST_LEVEL = 0.5*SATURATION;
 
     // we need sources spatially-sorted to find overlaps
@@ -32 +36 @@
         // XXX filter? if (source->mode & PM_SOURCE_MODE_SATSTAR) continue;
         if (source->mode & PM_SOURCE_MODE_BLEND) continue;
-        if (source->peak->flux < SAT_TEST_LEVEL) continue;
+        if (source->peak->flux < SATURATION) continue;
 
         // save these for reference below
@@ -45 +49 @@
         psVector *xVec = contour->data[0];
         psVector *yVec = contour->data[1];
-
-        // XXX should we filter based on the number of pixels in the contour?
+        if (xVec->n < 5) continue;
 
         // find the center of the contour (let's just use mid[x,y])
@@ -62 +65 @@
         int yCenter = 0.5*(yMin + yMax);
         psFree (contour);
+
+        psAssert (xCenter >= source->pixels->col0, "invalid shift in object center");
+        psAssert (xCenter <  source->pixels->col0 + source->pixels->numCols, "invalid shift in object center");
+        psAssert (yCenter >= source->pixels->row0, "invalid shift in object center");
+        psAssert (yCenter <  source->pixels->row0 + source->pixels->numRows, "invalid shift in object center");
 
         // reset the peak for this source to the value of the center pixel