Index: /branches/eam_branch_20080324/psphot/src/psphotExtendedSourceFits.c
===================================================================
--- /branches/eam_branch_20080324/psphot/src/psphotExtendedSourceFits.c	(revision 17385)
+++ /branches/eam_branch_20080324/psphot/src/psphotExtendedSourceFits.c	(revision 17386)
@@ -155,25 +155,29 @@
 	  pmModel *modelFit = NULL;
 	  if (convolved) {
-	    modelFit = psphotPSFConvModel (readout, source, modelType, maskVal, psfSize);
-	    psTrace ("psphot", 4, "fit psf-conv model for %f, %f : %s chisq = %f\n", source->moments->x, source->moments->y, pmModelClassGetName (modelFit->type), modelFit->chisq);
-	    Nconvolve ++;
-	    if (!(modelFit->flags & (PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE))) {
-		NconvolvePass ++;
-	    }
+	      modelFit = psphotPSFConvModel (readout, source, modelType, maskVal, psfSize);
+	      if (!modelFit) {
+		  psTrace ("psphot", 5, "failed to fit psf-conv model for object at %f, %f", source->moments->x, source->moments->y);
+		  continue;
+	      } 
+	      psTrace ("psphot", 4, "fit psf-conv model for %f, %f : %s chisq = %f\n", source->moments->x, source->moments->y, pmModelClassGetName (modelFit->type), modelFit->chisq);
+	      Nconvolve ++;
+	      if (!(modelFit->flags & (PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE))) {
+		  NconvolvePass ++;
+	      }
 	  } else {
 	      psFree (source->modelFlux);
 	      source->modelFlux = NULL;
-	    modelFit = psphotFitEXT (readout, source, modelType, maskVal);
-	    pmSourceCacheModel (source, maskVal);
-	    psTrace ("psphot", 4, "fit plain model for %f, %f : %s chisq = %f\n", source->moments->x, source->moments->y, pmModelClassGetName (modelFit->type), modelFit->chisq);
-	    Nplain ++;
-	    if (!(modelFit->flags & (PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE))) {
-		NplainPass ++;
-	    }
+	      modelFit = psphotFitEXT (readout, source, modelType, maskVal);
+	      if (!modelFit) {
+		  psTrace ("psphot", 5, "failed to fit plain model for object at %f, %f", source->moments->x, source->moments->y);
+		  continue;
+	      } 
+	      pmSourceCacheModel (source, maskVal);
+	      psTrace ("psphot", 4, "fit plain model for %f, %f : %s chisq = %f\n", source->moments->x, source->moments->y, pmModelClassGetName (modelFit->type), modelFit->chisq);
+	      Nplain ++;
+	      if (!(modelFit->flags & (PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE))) {
+		  NplainPass ++;
+	      }
 	  }
-	  if (!modelFit) {
-	    psTrace ("psphot", 5, "failed to generate model guess for object at %f, %f", source->moments->x, source->moments->y);
-	    continue;
-	  } 
 
 	  // save each of the model flux images and store the best