Index: trunk/psphot/src/psphotGuessModels.c
===================================================================
--- trunk/psphot/src/psphotGuessModels.c	(revision 13569)
+++ trunk/psphot/src/psphotGuessModels.c	(revision 13900)
@@ -17,5 +17,5 @@
 
 // construct an initial PSF model for each object
-bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf) {
+bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal) {
 
   psTimerStart ("psphot");
@@ -57,21 +57,21 @@
     pmModel *modelPSF = pmModelFromPSF (modelEXT, psf);
     if (modelPSF == NULL) {
-	psError(PSPHOT_ERR_PSF, false,
-		"Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
-		source->peak->y, source->peak->x);
-	//
-	// Try the centre of the image
-	//
-	modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
-	modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
-	modelPSF = pmModelFromPSF (modelEXT, psf);
-	if (modelPSF == NULL) {
-	    psError(PSPHOT_ERR_PSF, false,
-		    "Failed to determine PSF model at centre of image");
-	    psFree(modelEXT);
-	    return false;
-	}
+        psError(PSPHOT_ERR_PSF, false,
+                "Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
+                source->peak->y, source->peak->x);
+        //
+        // Try the centre of the image
+        //
+        modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
+        modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
+        modelPSF = pmModelFromPSF (modelEXT, psf);
+        if (modelPSF == NULL) {
+            psError(PSPHOT_ERR_PSF, false,
+                    "Failed to determine PSF model at centre of image");
+            psFree(modelEXT);
+            return false;
+        }
 
-	source->mode |= PM_SOURCE_MODE_BADPSF;
+        source->mode |= PM_SOURCE_MODE_BADPSF;
     }
     psFree (modelEXT);
@@ -85,5 +85,5 @@
     source->modelPSF->residuals = psf->residuals;
 
-    pmSourceCacheModel (source);
+    pmSourceCacheModel (source, maskVal);
   }
   psLogMsg ("psphot.models", 4, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));