Index: trunk/psphot/src/psphotReadout.c
===================================================================
--- trunk/psphot/src/psphotReadout.c	(revision 7638)
+++ trunk/psphot/src/psphotReadout.c	(revision 7716)
@@ -11,10 +11,10 @@
     // XXX does this need to invoke I/O?
     // XXX move this input the psphotImageLoop level?
-    if (!pmReadoutSetMaskWeight (readout)) {
-	return false;
+    if (!pmReadoutGenerateMaskWeight (readout)) {
+        return false;
     }
 
     // I have a valid mask, now mask in the analysis region of interest
-    psphotMaskReadout (readout, recipe); 
+    psphotMaskReadout (readout, recipe);
 
     // run a single-model test if desired
@@ -38,10 +38,10 @@
     // faint sources not classified?
     if (!psphotRoughClass (sources, recipe)) {
-	psFree (peaks);
-	psFree (sources);
-	psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
-	pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
-	pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
-	return false;
+        psFree (peaks);
+        psFree (sources);
+        psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+        pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
+        pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
+        return false;
     }
 
@@ -73,6 +73,6 @@
     // measure aperture photometry corrections
     if (!psphotApResid (readout, sources, recipe, psf)) {
-	psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
-	return false;
+        psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
+        return false;
     }
 
@@ -89,5 +89,5 @@
     psphotSourceFreePixels (sources);
 
-    // save the results of the analysis 
+    // save the results of the analysis
     psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY,    "psphot sources", sources);
     psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.HEADER",  PS_DATA_METADATA, "header stats", header);