Index: trunk/psphot/src/psphotEnsemblePSF.c
===================================================================
--- trunk/psphot/src/psphotEnsemblePSF.c	(revision 6571)
+++ trunk/psphot/src/psphotEnsemblePSF.c	(revision 6715)
@@ -44,10 +44,10 @@
 	// skip non-astronomical objects (very likely defects)
 	// XXX EAM : should we try these anyway?
-	if (inSource->type == PM_SOURCE_DEFECT) continue; 
-	if (inSource->type == PM_SOURCE_SATURATED) continue;
+	if (inSource->type == PM_SOURCE_TYPE_DEFECT) continue; 
+	if (inSource->type == PM_SOURCE_TYPE_SATURATED) continue;
 	if (final) {
-	    if (inSource->mode &  PM_SOURCE_SUBTRACTED) continue;
+	    if (inSource->mode &  PM_SOURCE_MODE_SUBTRACTED) continue;
 	} else {
-	    if (inSource->mode &  PM_SOURCE_BLEND) continue;
+	    if (inSource->mode &  PM_SOURCE_MODE_BLEND) continue;
 	}
 
@@ -61,5 +61,5 @@
 	// really saturated stars should be re-measured for a better centroid
 	// XXX EAM : move this to a 'clear satstar function'
-	if (inSource->mode &  PM_SOURCE_SATSTAR) {
+	if (inSource->mode &  PM_SOURCE_MODE_SATSTAR) {
 	    status = pmSourceMoments (inSource, INNER_RADIUS);
 	}
@@ -68,5 +68,5 @@
 	// use the source moments, etc to guess basic model parameters
 	pmModel *modelEXT = pmSourceModelGuess (inSource, psf->type); 
-	if (inSource->mode &  PM_SOURCE_SATSTAR) {
+	if (inSource->mode &  PM_SOURCE_MODE_SATSTAR) {
 	    modelEXT->params->data.F32[2] = inSource->moments->x;
 	    modelEXT->params->data.F32[3] = inSource->moments->y;
@@ -118,9 +118,9 @@
 	// fill in the model pixel values
 	psImageInit (flux, 0.0);
-	psImageKeepCircle (mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
-	pmSourceAddModel (flux, mask, model, false, false);
+	psImageKeepCircle (mask, x, y, model->radius, "OR", PM_SOURCE_MASK_MARKED);
+	pmModelAdd (flux, mask, model, false, false);
 
 	// calculate nDOF (nPix - 1)
-	// int Nmaskpix = psImageCountPixelMask (mask, allArray, PSPHOT_MASK_SATURATED);
+	// int Nmaskpix = psImageCountPixelMask (mask, allArray, PM_SOURCE_MASK_SATURATED);
 	// model->nDOF  = mask->numCols*mask->numRows - Nmaskpix - 1;
 
@@ -195,7 +195,7 @@
 
 	// subtract object
-	pmSourceSubModel (Fi->pixels, Fi->mask, Fi->modelPSF, false, false);
-	Fi->mode |= PM_SOURCE_SUBTRACTED;
-	if (!final) Fi->mode |= PM_SOURCE_TEMPSUB;
+	pmModelSub (Fi->pixels, Fi->mask, Fi->modelPSF, false, false);
+	Fi->mode |= PM_SOURCE_MODE_SUBTRACTED;
+	if (!final) Fi->mode |= PM_SOURCE_MODE_TEMPSUB;
     }
 
@@ -209,7 +209,7 @@
 	y = model->params->data.F32[3];
 
-	psImageKeepCircle (Fi->mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
+	psImageKeepCircle (Fi->mask, x, y, model->radius, "OR", PM_SOURCE_MASK_MARKED);
 	pmSourceChisq (model, Fi->pixels, Fi->mask, Fi->weight);
-	psImageKeepCircle (Fi->mask, x, y, model->radius, "AND", ~PSPHOT_MASK_MARKED);
+	psImageKeepCircle (Fi->mask, x, y, model->radius, "AND", ~PM_SOURCE_MASK_MARKED);
     }