Changeset 30753 for branches/eam_branches/ipp-20110213/psphot/src/psphotSourceStats.c

Timestamp:

Feb 24, 2011, 12:49:04 PM (15 years ago)

Author:

eugene

Message:

correct typo in logic for GuessModels; test option for large object moments (try harder); updates to visuals

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotSourceStats.c (modified) (4 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotSourceStats.c

@@ -122 +122 @@
         // allocate space for moments
         source->moments = pmMomentsAlloc();
+
+        if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) {
+            fprintf (stderr, "moment failure\n");
+        }
 
         // allocate image, weight, mask arrays for each peak (square of radius OUTER)
@@ -361 +365 @@
 
     bool status = false;
-    float BIG_RADIUS;
     psScalar *scalar = NULL;
 
@@ -415 +418 @@
             continue;
         }
+
+        if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+            fprintf (stderr, "satstar: %f,%f\n", source->peak->xf, source->peak->yf);
+        }
 
         // measure basic source moments (no S/N clipping on input pixels)
@@ -431 +438 @@
             psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
         }           
-        if (status) {
+        if (status && (source->moments->Mrf < 2.0*SIGMA)) {
             Nmoments ++;
             continue;
         }
 
-        // if no valid pixels, or massive swing, likely saturated source,
+        // if no valid pixels, massive swing or very large Mrf, likely saturated source,
         // try a much larger box
-        BIG_RADIUS = PS_MIN (INNER, 3*RADIUS);
+        float BIG_RADIUS = 3.0*RADIUS;
+        float BIG_SIGMA  = 3.0*SIGMA;
+
+        { 
+            // NOTE this is slightly sleazy, but only slightly: pmSourceRedefinePixels uses the readout
+            // to pass the pointers to the parent image data.  I guess the API could be simplified:
+            // we could recover this from the source in the function
+
+            pmReadout tmpReadout;
+            tmpReadout.image    = (psImage *)source->pixels->parent;
+            tmpReadout.mask     = (psImage *)source->maskView->parent;
+            tmpReadout.variance = (psImage *)source->variance->parent;
+
+            // re-allocate image, weight, mask arrays for each peak (square of radius OUTER)
+            pmSourceRedefinePixels (source, &tmpReadout, source->peak->x, source->peak->y, BIG_RADIUS + 2);
+        }
+
         psTrace ("psphot", 4, "retrying moments for %d, %d\n", source->peak->x, source->peak->y);
-        status = pmSourceMoments (source, BIG_RADIUS, 3.0*SIGMA, 0.0, maskVal);
+        status = pmSourceMoments (source, BIG_RADIUS, BIG_SIGMA, 0.0, maskVal);
         if (status) {
             source->mode |= PM_SOURCE_MODE_BIG_RADIUS;