Index: trunk/psphot/src/psphotFullFit.c
===================================================================
--- trunk/psphot/src/psphotFullFit.c	(revision 6379)
+++ trunk/psphot/src/psphotFullFit.c	(revision 6715)
@@ -32,7 +32,7 @@
 	// skip non-astronomical objects (very likely defects)
 	// XXX EAM : should we try these anyway?
-	if (source->mode &  PM_SOURCE_BLEND) continue;
-	if (source->type == PM_SOURCE_DEFECT) continue; 
-	if (source->type == PM_SOURCE_SATURATED) continue;
+	if (source->mode &  PM_SOURCE_MODE_BLEND) continue;
+	if (source->type == PM_SOURCE_TYPE_DEFECT) continue; 
+	if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
 
 	// save the PSF model from the Ensemble fit
@@ -43,6 +43,6 @@
 
 	// replace object in image
-	pmSourceAddModel (source->pixels, source->mask, modelPSF, false, false);
-	source->mode &= ~PM_SOURCE_SUBTRACTED;
+	pmModelAdd (source->pixels, source->mask, modelPSF, false, false);
+	source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
 
 	psphotCheckRadiusPSF (readout, source, modelPSF);
@@ -52,7 +52,7 @@
 
 	// fit PSF model (set/unset the pixel mask)
-	psImageKeepCircle (source->mask, x, y, modelPSF->radius, "OR", PSPHOT_MASK_MARKED);
+	psImageKeepCircle (source->mask, x, y, modelPSF->radius, "OR", PM_SOURCE_MASK_MARKED);
 	pmSourceFitModel (source, modelPSF, true);
-	psImageKeepCircle (source->mask, x, y, modelPSF->radius, "AND", ~PSPHOT_MASK_MARKED);
+	psImageKeepCircle (source->mask, x, y, modelPSF->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
 	// track model evaluations
@@ -62,7 +62,7 @@
 	// does the PSF model succeed?
 	if (psphotEvalPSF (source, source->modelPSF)) {
-	    pmSourceSubModel (source->pixels, source->mask, source->modelPSF, false, false);
-	    source->mode |=  PM_SOURCE_SUBTRACTED;
-	    source->mode &= ~PM_SOURCE_TEMPSUB;
+	    pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+	    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+	    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
 	    psFree (LIN);
 	    Nsub ++;
@@ -82,5 +82,5 @@
 
 	// skip the source if we don't think it is extended
-	if (source->type != PM_SOURCE_EXTENDED) goto subLINEAR;
+	if (source->type != PM_SOURCE_TYPE_EXTENDED) goto subLINEAR;
 	if (source->moments->SN < EXT_MIN_SN) goto subLINEAR;
 
@@ -101,7 +101,7 @@
 
 	// fit EXT (not PSF) model (set/unset the pixel mask)
-	psImageKeepCircle (source->mask, x, y, modelEXT->radius, "OR", PSPHOT_MASK_MARKED);
+	psImageKeepCircle (source->mask, x, y, modelEXT->radius, "OR", PM_SOURCE_MASK_MARKED);
 	pmSourceFitModel (source, modelEXT, false);
-	psImageKeepCircle (source->mask, x, y, modelEXT->radius, "AND", ~PSPHOT_MASK_MARKED);
+	psImageKeepCircle (source->mask, x, y, modelEXT->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
 	// track model evaluations
@@ -111,7 +111,7 @@
 	// does the EXT model succeed?
 	if (psphotEvalEXT (source, source->modelEXT)) {
-	    pmSourceSubModel (source->pixels, source->mask, source->modelEXT, false, false);
-	    source->mode |=  PM_SOURCE_SUBTRACTED;
-	    source->mode &= ~PM_SOURCE_TEMPSUB;
+	    pmModelSub (source->pixels, source->mask, source->modelEXT, false, false);
+	    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+	    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
 	    psFree (LIN);
 	    Nsub ++;
@@ -123,7 +123,7 @@
 	psFree (source->modelPSF);
 	source->modelPSF = LIN;
-	pmSourceSubModel (source->pixels, source->mask, source->modelPSF, false, false);
-	source->mode |= PM_SOURCE_SUBTRACTED;
-	source->mode |= PM_SOURCE_TEMPSUB;
+	pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+	source->mode |= PM_SOURCE_MODE_SUBTRACTED;
+	source->mode |= PM_SOURCE_MODE_TEMPSUB;
 	Nsub ++;
     }