Changeset 30118 for branches/czw_branch/20101203/psModules/src/objects/pmPSFtryMakePSF.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmPSFtryMakePSF.c (modified) (10 diffs)

branches/czw_branch/20101203/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 *pGoodFit, 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 (pGoodFit, psf, psfTry->sources, x, y, srcMask)) {
         psFree(x);
         psFree(y);
         return false;
+    }
+    if (!*pGoodFit) {
+        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 (pGoodFit, 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 (!*pGoodFit) {
+            // 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:
@@ -139 +154 @@
 
             pmModel *modelPSF = pmModelFromPSF (source->modelEXT, psf);
+            if (!modelPSF) {
+                fprintf(f, "modelPSF is NULL\n");
+                break;
+            }
+            if (!source->modelEXT) {
+                fprintf(f, "source->modelEXT is NULL\n");
+                break;
+            }
 
             fprintf (f, "%f %f : ", source->modelEXT->params->data.F32[PM_PAR_XPOS], source->modelEXT->params->data.F32[PM_PAR_YPOS]);
@@ -163 +186 @@
 
 // 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 *pGoodFit, 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 +242 @@
         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 (pGoodFit, trend, srcMask, 0xff, x, y, e0, NULL);
+        if (!*pGoodFit) {
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
+            return true;
+        }
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
@@ -228 +257 @@
         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 (pGoodFit, trend, srcMask, 0xff, x, y, e1, NULL);
+        if (!*pGoodFit) {
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
+            return true;
+        }
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
@@ -237 +272 @@
         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 (pGoodFit, trend, srcMask, 0xff, x, y, e2, NULL);
+        if (!*pGoodFit) {
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
+            return true;
+        }
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
@@ -246 +287 @@
         if (!status) {
             psError (PS_ERR_UNKNOWN, true, "failed to fit PSF shape params");
+            psFree (e0);
+            psFree (e1);
+            psFree (e2);
             return false;
         }