Changeset 30029

Timestamp:

Dec 14, 2010, 9:01:22 AM (15 years ago)

Author:

eugene

Message:

update to use modified psImageMapFit APIs

Location:

branches/eam_branches/ipp-20101205/psModules/src/objects

Files:

• pmPSFtry.h (modified) (2 diffs)
• pmPSFtryMakePSF.c (modified) (9 diffs)
• pmPSFtryModel.c (modified) (2 diffs)
• pmTrend2D.c (modified) (4 diffs)
• pmTrend2D.h (modified) (1 diff)

branches/eam_branches/ipp-20101205/psModules/src/objects/pmPSFtry.h

@@ -100 +100 @@
 bool pmPSFtryFitEXT (pmPSFtry *psfTry, pmPSFOptions *options, psImageMaskType maskVal, psImageMaskType markVal);
 
-bool pmPSFtryMakePSF (pmPSFtry *psfTry);
+bool pmPSFtryMakePSF (bool *goodFit, pmPSFtry *psfTry);
 
 bool pmPSFtryFitPSF (pmPSFtry *psfTry, pmPSFOptions *options, psImageMaskType maskVal, psImageMaskType markVal);
@@ -123 +123 @@
 );
 
-bool pmPSFFitShapeParams (pmPSF *psf, psArray *sources, psVector *x, psVector *y, psVector *srcMask);
+bool pmPSFFitShapeParams (bool *goodFit, pmPSF *psf, psArray *sources, psVector *x, psVector *y, psVector *srcMask);
 
 float psVectorSystematicError (psVector *residuals, psVector *errors, float clipFraction);

branches/eam_branches/ipp-20101205/psModules/src/objects/pmPSFtryMakePSF.c

@@ -50 +50 @@
 Note: some of the array entries may be NULL (failed fits); ignore them.
  *****************************************************************************/
-bool pmPSFtryMakePSF (pmPSFtry *psfTry)
+bool pmPSFtryMakePSF (bool *goodFit, pmPSFtry *psfTry)
 {
     PS_ASSERT_PTR_NON_NULL(psfTry, false);
@@ -74 +74 @@
 
     // fit the shape parameters (SXX, SYY, SXY) as a function of position
-    if (!pmPSFFitShapeParams (psf, psfTry->sources, x, y, srcMask)) {
+    if (!pmPSFFitShapeParams (goodFit, psf, psfTry->sources, x, y, srcMask)) {
         psFree(x);
         psFree(y);
         return false;
+    }
+    if (!goodFit) {
+        psWarning ("poor fit to PSF shape parameters for trend order %d, %d, skipping\n", psf->trendNx, psf->trendNy);
+        psFree(x);
+        psFree(y);
+        return true;
     }
 
@@ -115 +121 @@
         // the mask is carried from previous steps and updated with this operation
         // the weight is either the flux error or NULL, depending on 'psf->poissonErrorParams'
-        if (!pmTrend2DFit (trend, srcMask, 0xff, x, y, z, NULL)) {
+        if (!pmTrend2DFit (goodFit, trend, srcMask, 0xff, x, y, z, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "failed to build psf model for parameter %d", i);
             psFree(x);
@@ -122 +128 @@
             return false;
         }
+        if (!goodFit) {
+            // if we do not get a good fit (but do not actually hit an error), 
+            // tell the calling program to try something else
+            psWarning ("poor fit to PSF parameter %d for trend order %d, %d, skipping\n", i, psf->trendNx, psf->trendNy);
+            psFree(x);
+            psFree(y);
+            psFree(z);
+            return true;
+        }
         if (trend->mode == PM_TREND_MAP) {
             // p_psImagePrint (2, trend->map->map, "param N Before"); // XXX TEST:
@@ -163 +178 @@
 
 // fit the shape parameters using the supplied order (pmPSF->trendNx,trendNy)
-bool pmPSFFitShapeParams (pmPSF *psf, psArray *sources, psVector *x, psVector *y, psVector *srcMask) {
+bool pmPSFFitShapeParams (bool *goodFit, pmPSF *psf, psArray *sources, psVector *x, psVector *y, psVector *srcMask) {
 
     // we are doing a robust fit.  after each pass, we drop points which are more deviant than
@@ -219 +234 @@
         trend = psf->params->data[PM_PAR_E0];
         trend->stats->clipIter = 1; // in allocation, this value is set to the value of nIter, but we should use 1 here
-        status &= pmTrend2DFit (trend, srcMask, 0xff, x, y, e0, NULL);
+        status &= pmTrend2DFit (goodFit, trend, srcMask, 0xff, x, y, e0, NULL);
+        if (!goodFit) {
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
+            return true;
+        }
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
@@ -228 +249 @@
         trend = psf->params->data[PM_PAR_E1];
         trend->stats->clipIter = 1; // in allocation, this value is set to the value of nIter, but we should use 1 here
-        status &= pmTrend2DFit (trend, srcMask, 0xff, x, y, e1, NULL);
+        status &= pmTrend2DFit (goodFit, trend, srcMask, 0xff, x, y, e1, NULL);
+        if (!goodFit) {
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
+            return true;
+        }
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
@@ -237 +264 @@
         trend = psf->params->data[PM_PAR_E2];
         trend->stats->clipIter = 1; // in allocation, this value is set to the value of nIter, but we should use 1 here
-        status &= pmTrend2DFit (trend, srcMask, 0xff, x, y, e2, NULL);
+        status &= pmTrend2DFit (goodFit, trend, srcMask, 0xff, x, y, e2, NULL);
+        if (!goodFit) {
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
+            return true;
+        }
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
@@ -246 +279 @@
         if (!status) {
             psError (PS_ERR_UNKNOWN, true, "failed to fit PSF shape params");
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
             return false;
         }

branches/eam_branches/ipp-20101205/psModules/src/objects/pmPSFtryModel.c

@@ -136 +136 @@
 
         // stage 2: construct a psf (pmPSF) from this collection of model fits, including the 2D variation
-        if (!pmPSFtryMakePSF (psfTry)) {
+        bool goodFit = false;
+        if (!pmPSFtryMakePSF (&goodFit, psfTry)) {
             psError(PS_ERR_UNKNOWN, false, "failed to construct a psf model from collection of sources");
             psFree(psfTry);
             return NULL;
         }
+        if (!goodFit) {
+            psWarning ("poor psf fit for order %d, skipping\n", i);
+            continue;
+        }
 
         // stage 3: refit with fixed shape parameters, measure pmPSFtry->metric
@@ -169 +174 @@
     }
     psFree (srcMask);
+
+    if (!minPSF) {
+        psError(PS_ERR_UNKNOWN, false, "failed to construct a valid psf model from the sources");
+        psFree(psfTry);
+        return NULL;
+    }
 
     // keep the ones matching the min systematic error:

branches/eam_branches/ipp-20101205/psModules/src/objects/pmTrend2D.c

@@ -179 +179 @@
 }
 
-bool pmTrend2DFit(pmTrend2D *trend, psVector *mask, psVectorMaskType maskVal, const psVector *x,
+bool pmTrend2DFit(bool *goodFit, pmTrend2D *trend, psVector *mask, psVectorMaskType maskVal, const psVector *x,
                   const psVector *y, const psVector *f, const psVector *df)
 {
@@ -189 +189 @@
 
     bool status = false;
-    bool goodFit = false;
+    *goodFit = false;
+    // for the psImageMap fit, it is possible to have valid data but no valid solution for
+    // example, an isolated cell may not be reached from other cells, making the solution
+    // degenerate.  psImageMapFit should probably handle this case, but until it does, we allow
+    // it to fail on the result, but not yield an error (goodFit = false).
+    // psVectorClipFitPolynomial2D can not fail in this way (really?), so goodFit is always
+    // true
 
     switch (trend->mode) {
@@ -198 +204 @@
         // of points in the image, and potentially based on the fractional range of the
         // data?
+        *goodFit = true;
         break;
 
@@ -203 +210 @@
         // XXX supply fraction from trend elements
         // XXX need to add the API which adjusts the scale
-        status = psImageMapClipFit(&goodFit, trend->map, trend->stats, mask, maskVal, x, y, f, df);
+        status = psImageMapClipFit(goodFit, trend->map, trend->stats, mask, maskVal, x, y, f, df);
         break;
 

branches/eam_branches/ipp-20101205/psModules/src/objects/pmTrend2D.h

@@ -76 +76 @@
     );
 
-bool pmTrend2DFit(pmTrend2D *trend,
+bool pmTrend2DFit(bool *goodFit,
+                  pmTrend2D *trend,
                   psVector *mask,       // Warning: mask is modified!
                   psVectorMaskType maskVal,