Index: /trunk/ppImage/src/ppImageDetrendMask.c
===================================================================
--- /trunk/ppImage/src/ppImageDetrendMask.c	(revision 7715)
+++ /trunk/ppImage/src/ppImageDetrendMask.c	(revision 7716)
@@ -16,7 +16,7 @@
 
     if (mask->image->type.type != PS_TYPE_MASK) {
-	image = psImageCopy (NULL, mask->image, PS_TYPE_MASK);
+        image = psImageCopy (NULL, mask->image, PS_TYPE_MASK);
     } else {
-	image = psMemIncrRefCounter (mask->image);
+        image = psMemIncrRefCounter (mask->image);
     }
 
@@ -34,6 +34,6 @@
 
 
-// XXX this function needs to use pmReadoutSetMask to construct the initial mask
+// XXX this function needs to use pmReadoutGenerateMask to construct the initial mask
 // then the pixels will correspond and pmMaskBadPixels can be correctly applied.
-// this function should not have to lookup the value of CELL.SATURATION, nor should it have to 
-// apply it.  
+// this function should not have to lookup the value of CELL.SATURATION, nor should it have to
+// apply it.
Index: /trunk/ppImage/src/ppImageDetrendReadout.c
===================================================================
--- /trunk/ppImage/src/ppImageDetrendReadout.c	(revision 7715)
+++ /trunk/ppImage/src/ppImageDetrendReadout.c	(revision 7716)
@@ -12,10 +12,10 @@
 
     // create the target mask and weight images
-    pmReadoutSetMaskWeight (input);
+    pmReadoutGenerateMaskWeight (input);
 
     // apply the externally supplied mask to the input->mask pixels
     if (options->doMask) {
         pmReadout *mask = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.MASK");
-	pmMaskBadPixels (input, mask, options->maskValue);
+        pmMaskBadPixels (input, mask, options->maskValue);
         // ppImageDetrendMask(input, mask);
     }
@@ -40,15 +40,15 @@
     // Bias, dark and overscan subtraction are all merged.
     if (options->doBias || options->doDark || options->doOverscan) {
-	if (!ppImageDetrendBias(input, bias, dark, options)) {
-	    return false;
-	}
+        if (!ppImageDetrendBias(input, bias, dark, options)) {
+            return false;
+        }
     }
 
     // Flat-field correction (no options used?)
     if (options->doFlat) {
-	pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
+        pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
         if (!pmFlatField(input, flat)) {
-	    return false;
-	}
+            return false;
+        }
     }
 
Index: /trunk/psphot/src/psphotReadout.c
===================================================================
--- /trunk/psphot/src/psphotReadout.c	(revision 7715)
+++ /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);