Changeset 30044

Timestamp:

Dec 15, 2010, 11:25:46 AM (15 years ago)

Author:

bills

Message:

Fix checking of good fit. Changed name to pGoodFit to emphasize that it is a pointer.
Fix a segv in trace code by checking for null pointers

Location:

trunk

Files:

• psLib/src/imageops/psImageMapFit.c (modified) (12 diffs)
• psLib/src/imageops/psImageMapFit.h (modified) (4 diffs)
• psModules/src/objects/pmPSFtry.h (modified) (2 diffs)
• psModules/src/objects/pmPSFtryMakePSF.c (modified) (9 diffs)
• psModules/src/objects/pmTrend2D.c (modified) (4 diffs)

trunk/psLib/src/imageops/psImageMapFit.c

@@ -48 +48 @@
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit(bool *goodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                    const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
     // XXX Add Asserts
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -83 +83 @@
         map->map->data.F32[0][0]   = psStatsGetValue(map->stats, mean);
         map->error->data.F32[0][0] = psStatsGetValue(map->stats, stdev);
-        *goodFit = true;
+        *pGoodFit = true;
         return true;
     }
@@ -89 +89 @@
     if (Nx == 1) {
         bool status;
-        status = psImageMapFit1DinY (goodFit, map, mask, maskValue, x, y, f, df);
+        status = psImageMapFit1DinY (pGoodFit, map, mask, maskValue, x, y, f, df);
         return status;
     }
     if (Ny == 1) {
         bool status;
-        status = psImageMapFit1DinX (goodFit, map, mask, maskValue, x, y, f, df);
+        status = psImageMapFit1DinX (pGoodFit, map, mask, maskValue, x, y, f, df);
         return status;
     }
@@ -339 +339 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }
 
 // measure residuals on each pass and clip outliers based on stats
-bool psImageMapClipFit(bool *goodFit, psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
+bool psImageMapClipFit(bool *pGoodFit, psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
                        const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -354 +354 @@
     psAssert(f, "impossible");
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // the user supplies one of various stats option pairs,
@@ -398 +398 @@
         psTrace("psLib.imageops", 6, "Loop iteration %d.  Calling psImageMapFit()\n", N);
         psS32 Nkeep = 0;
-        if (!psImageMapFit(goodFit, map, mask, maskValue, x, y, f, df)) {
+        if (!psImageMapFit(pGoodFit, map, mask, maskValue, x, y, f, df)) {
             psError(PS_ERR_UNKNOWN, false, "Could not fit image map.\n");
             psFree(resid);
@@ -404 +404 @@
             return false;
         }
-        if (!goodFit) {
+        if (!*pGoodFit) {
             psWarning ("bad fit to image map, try something else");
             return true;
@@ -463 +463 @@
     psFree(resid);
     if (!inMask) psFree (mask);
-    *goodFit = true; // XXX probably don't need to set this (set by psImageMapFit)
+    *pGoodFit = true; // XXX probably don't need to set this (set by psImageMapFit)
     return true;
 }
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinY(bool *goodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit1DinY(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -474 +474 @@
     assert (map->binning->nXruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -613 +613 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinX(bool *goodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit1DinX(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -624 +624 @@
     assert (map->binning->nYruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -763 +763 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }

trunk/psLib/src/imageops/psImageMapFit.h

@@ -8 +8 @@
 
 // fit the image map to a set of points
-bool psImageMapFit(bool *goodFit, 
+bool psImageMapFit(bool *pGoodFit, 
                    psImageMap *map,
                    const psVector *mask,
@@ -19 +19 @@
 
 // fit the image map to a set of points
-bool psImageMapClipFit(bool *goodFit, 
+bool psImageMapClipFit(bool *pGoodFit, 
                        psImageMap *map,
                        psStats *stats,
@@ -30 +30 @@
     );
 
-bool psImageMapFit1DinY(bool *goodFit, 
+bool psImageMapFit1DinY(bool *pGoodFit, 
                         psImageMap *map,
                         const psVector *mask,
@@ -40 +40 @@
     );
 
-bool psImageMapFit1DinX(bool *goodFit, 
+bool psImageMapFit1DinX(bool *pGoodFit, 
                         psImageMap *map,
                         const psVector *mask,

trunk/psModules/src/objects/pmPSFtry.h

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

trunk/psModules/src/objects/pmPSFtryMakePSF.c

@@ -50 +50 @@
 Note: some of the array entries may be NULL (failed fits); ignore them.
  *****************************************************************************/
-bool pmPSFtryMakePSF (bool *goodFit, 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 (goodFit, psf, psfTry->sources, x, y, srcMask)) {
+    if (!pmPSFFitShapeParams (pGoodFit, psf, psfTry->sources, x, y, srcMask)) {
         psFree(x);
         psFree(y);
         return false;
     }
-    if (!goodFit) {
+    if (!*pGoodFit) {
         psWarning ("poor fit to PSF shape parameters for trend order %d, %d, skipping\n", psf->trendNx, psf->trendNy);
         psFree(x);
@@ -121 +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 (goodFit, 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);
@@ -128 +128 @@
             return false;
         }
-        if (!goodFit) {
+        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
@@ -154 +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]);
@@ -178 +186 @@
 
 // fit the shape parameters using the supplied order (pmPSF->trendNx,trendNy)
-bool pmPSFFitShapeParams (bool *goodFit, 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
@@ -234 +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 (goodFit, trend, srcMask, 0xff, x, y, e0, NULL);
-        if (!goodFit) {
+        status &= pmTrend2DFit (pGoodFit, trend, srcMask, 0xff, x, y, e0, NULL);
+        if (!*pGoodFit) {
             psFree (e0);
             psFree (e1);
@@ -249 +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 (goodFit, trend, srcMask, 0xff, x, y, e1, NULL);
-        if (!goodFit) {
+        status &= pmTrend2DFit (pGoodFit, trend, srcMask, 0xff, x, y, e1, NULL);
+        if (!*pGoodFit) {
             psFree (e0);
             psFree (e1);
@@ -264 +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 (goodFit, trend, srcMask, 0xff, x, y, e2, NULL);
-        if (!goodFit) {
+        status &= pmTrend2DFit (pGoodFit, trend, srcMask, 0xff, x, y, e2, NULL);
+        if (!*pGoodFit) {
             psFree (e0);
             psFree (e1);

trunk/psModules/src/objects/pmTrend2D.c

@@ -179 +179 @@
 }
 
-bool pmTrend2DFit(bool *goodFit, pmTrend2D *trend, psVector *mask, psVectorMaskType maskVal, const psVector *x,
+bool pmTrend2DFit(bool *pGoodFit, pmTrend2D *trend, psVector *mask, psVectorMaskType maskVal, const psVector *x,
                   const psVector *y, const psVector *f, const psVector *df)
 {
@@ -189 +189 @@
 
     bool status = false;
-    *goodFit = false;
+    *pGoodFit = 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
+    // it to fail on the result, but not yield an error (pGoodFit = false).
+    // psVectorClipFitPolynomial2D can not fail in this way (really?), so pGoodFit is always
     // true
 
@@ -204 +204 @@
         // of points in the image, and potentially based on the fractional range of the
         // data?
-        *goodFit = true;
+        *pGoodFit = true;
         break;
 
@@ -210 +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(pGoodFit, trend->map, trend->stats, mask, maskVal, x, y, f, df);
         break;