Index: trunk/psLib/src/imageops/psImageMapFit.c
===================================================================
--- trunk/psLib/src/imageops/psImageMapFit.c	(revision 30042)
+++ trunk/psLib/src/imageops/psImageMapFit.c	(revision 30044)
@@ -48,10 +48,10 @@
 
 // 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,5 +83,5 @@
         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,10 +89,10 @@
     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,10 +339,10 @@
     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,5 +354,5 @@
     psAssert(f, "impossible");
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // the user supplies one of various stats option pairs,
@@ -398,5 +398,5 @@
         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,5 +404,5 @@
             return false;
         }
-	if (!goodFit) {
+	if (!*pGoodFit) {
 	    psWarning ("bad fit to image map, try something else");
 	    return true;
@@ -463,10 +463,10 @@
     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,5 +474,5 @@
     assert (map->binning->nXruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -613,10 +613,10 @@
     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,5 +624,5 @@
     assert (map->binning->nYruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -763,5 +763,5 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }
Index: trunk/psLib/src/imageops/psImageMapFit.h
===================================================================
--- trunk/psLib/src/imageops/psImageMapFit.h	(revision 30042)
+++ trunk/psLib/src/imageops/psImageMapFit.h	(revision 30044)
@@ -8,5 +8,5 @@
 
 // fit the image map to a set of points
-bool psImageMapFit(bool *goodFit, 
+bool psImageMapFit(bool *pGoodFit, 
 		   psImageMap *map,
                    const psVector *mask,
@@ -19,5 +19,5 @@
 
 // fit the image map to a set of points
-bool psImageMapClipFit(bool *goodFit, 
+bool psImageMapClipFit(bool *pGoodFit, 
 		       psImageMap *map,
                        psStats *stats,
@@ -30,5 +30,5 @@
     );
 
-bool psImageMapFit1DinY(bool *goodFit, 
+bool psImageMapFit1DinY(bool *pGoodFit, 
 			psImageMap *map,
                         const psVector *mask,
@@ -40,5 +40,5 @@
     );
 
-bool psImageMapFit1DinX(bool *goodFit, 
+bool psImageMapFit1DinX(bool *pGoodFit, 
 			psImageMap *map,
                         const psVector *mask,
Index: trunk/psModules/src/objects/pmPSFtry.h
===================================================================
--- trunk/psModules/src/objects/pmPSFtry.h	(revision 30042)
+++ trunk/psModules/src/objects/pmPSFtry.h	(revision 30044)
@@ -100,5 +100,5 @@
 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,5 +123,5 @@
 );
 
-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);
Index: trunk/psModules/src/objects/pmPSFtryMakePSF.c
===================================================================
--- trunk/psModules/src/objects/pmPSFtryMakePSF.c	(revision 30042)
+++ trunk/psModules/src/objects/pmPSFtryMakePSF.c	(revision 30044)
@@ -50,5 +50,5 @@
 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,10 +74,10 @@
 
     // 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,5 +121,5 @@
         // 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,5 +128,5 @@
             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,4 +154,12 @@
 
             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,5 +186,5 @@
 
 // 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,6 +242,6 @@
 	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,6 +257,6 @@
 	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,6 +272,6 @@
 	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);
Index: trunk/psModules/src/objects/pmTrend2D.c
===================================================================
--- trunk/psModules/src/objects/pmTrend2D.c	(revision 30042)
+++ trunk/psModules/src/objects/pmTrend2D.c	(revision 30044)
@@ -179,5 +179,5 @@
 }
 
-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,10 +189,10 @@
 
     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,5 +204,5 @@
         // of points in the image, and potentially based on the fractional range of the
         // data?
-	*goodFit = true;
+	*pGoodFit = true;
         break;
 
@@ -210,5 +210,5 @@
         // 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;