Index: trunk/psphot/src/psphotSourceFits.c
===================================================================
--- trunk/psphot/src/psphotSourceFits.c	(revision 6481)
+++ trunk/psphot/src/psphotSourceFits.c	(revision 6715)
@@ -1,4 +1,3 @@
 # include "psphot.h"
-# include "psEllipse.h"
 
 // given a source with an existing modelPSF, attempt a full PSF fit, subtract if successful
@@ -18,7 +17,7 @@
 
     // fit PSF model (set/unset the pixel mask)
-    psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PM_SOURCE_MASK_MARKED);
     pmSourceFitModel (source, PSF, true);
-    psImageKeepCircle (source->mask, x, y, PSF->radius, "AND", ~PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, PSF->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
     // does the PSF model succeed?
@@ -29,5 +28,5 @@
 
     psTrace ("psphot.blend", 5, "fitted as PSF\n");
-    pmSourceSubModel (source->pixels, source->mask, PSF, false, false);
+    pmModelSub (source->pixels, source->mask, PSF, false, false);
 
     // free old model, save new model 
@@ -35,6 +34,6 @@
     source->modelPSF = PSF;
 
-    source->mode |=  PM_SOURCE_SUBTRACTED;
-    source->mode &= ~PM_SOURCE_TEMPSUB;
+    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     return true;
 }
@@ -67,7 +66,7 @@
 
     // skip the source if we don't think it is extended
-    if (source->type == PM_SOURCE_UNKNOWN) return false;
-    if (source->type == PM_SOURCE_DEFECT) return false;
-    if (source->type == PM_SOURCE_SATURATED) return false;
+    if (source->type == PM_SOURCE_TYPE_UNKNOWN) return false;
+    if (source->type == PM_SOURCE_TYPE_DEFECT) return false;
+    if (source->type == PM_SOURCE_TYPE_SATURATED) return false;
     if (source->moments->SN < EXT_MIN_SN) return false;
 
@@ -110,11 +109,11 @@
     // sub EXT
     psFree (DBL);
-    pmSourceSubModel (source->pixels, source->mask, EXT, false, false);
+    pmModelSub (source->pixels, source->mask, EXT, false, false);
     psTrace ("psphot.blend", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[2], EXT->params->data.F32[3]);
 
     // save new model
     source->modelEXT = EXT;
-    source->mode |=  PM_SOURCE_SUBTRACTED;
-    source->mode &= ~PM_SOURCE_TEMPSUB;
+    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     return true;
 
@@ -122,6 +121,6 @@
     // sub DLB
     psFree (EXT);
-    pmSourceSubModel (source->pixels, source->mask, (pmModel *) DBL->data[0], false, false);
-    pmSourceSubModel (source->pixels, source->mask, (pmModel *) DBL->data[1], false, false);
+    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[0], false, false);
+    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], false, false);
     psTrace ("psphot.blend", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[2], ONE->params->data.F32[3]);
 
@@ -129,7 +128,7 @@
     psFree (source->modelPSF);
     source->modelPSF = psMemCopy (DBL->data[0]);
-    source->mode    |= PM_SOURCE_SUBTRACTED;
-    source->mode    |= PM_SOURCE_PAIR;
-    source->mode    &= ~PM_SOURCE_TEMPSUB;
+    source->mode    |= PM_SOURCE_MODE_SUBTRACTED;
+    source->mode    |= PM_SOURCE_MODE_PAIR;
+    source->mode    &= ~PM_SOURCE_MODE_TEMPSUB;
 
     // copy most data from the primary source (modelEXT, blends stay NULL)
@@ -155,6 +154,6 @@
     pmModel *DBL;
     pmModel *PSF;
-    EllipseAxes axes;
-    EllipseMoments moments;
+    psEllipseAxes axes;
+    psEllipseMoments moments;
     psArray *modelSet;
     
@@ -163,5 +162,5 @@
     moments.y2 = source->moments->Sy;
     moments.xy = source->moments->Sxy;
-    axes = EllipseMomentsToAxes (moments);
+    axes = psEllipseMomentsToAxes (moments);
 
     dx = 2 * cos (axes.theta);
@@ -190,7 +189,7 @@
 
     // fit EXT (not PSF) model (set/unset the pixel mask)
-    psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PM_SOURCE_MASK_MARKED);
     pmSourceFitSet (source, modelSet, true);
-    psImageKeepCircle (source->mask, x, y, PSF->radius, "AND", ~PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, PSF->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
     return (modelSet);
@@ -210,7 +209,7 @@
 
     // fit EXT (not PSF) model (set/unset the pixel mask)
-    psImageKeepCircle (source->mask, x, y, EXT->radius, "OR", PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, EXT->radius, "OR", PM_SOURCE_MASK_MARKED);
     pmSourceFitModel (source, EXT, false);
-    psImageKeepCircle (source->mask, x, y, EXT->radius, "AND", ~PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, EXT->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
     return (EXT);
@@ -222,5 +221,5 @@
 
     // if this source is not a possible blend, just fit as PSF
-    if ((source->blends == NULL) || (source->mode & PM_SOURCE_SATSTAR)) {
+    if ((source->blends == NULL) || (source->mode & PM_SOURCE_MODE_SATSTAR)) {
 	bool status = psphotFitPSF (readout, source);
 	return status;
@@ -273,7 +272,7 @@
 
     // fit PSF model (set/unset the pixel mask)
-    psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PM_SOURCE_MASK_MARKED);
     pmSourceFitSet (source, modelSet, true);
-    psImageKeepCircle (source->mask, x, y, PSF->radius, "AND", ~PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, PSF->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
     // evaluate the blend objects, subtract if good, free otherwise
@@ -291,7 +290,7 @@
 
 	psTrace ("psphot.blend", 5, "fitted blend as PSF\n");
-	pmSourceSubModel (source->pixels, source->mask, model, false, false);
-	src->mode |=  PM_SOURCE_SUBTRACTED;
-	src->mode &= ~PM_SOURCE_TEMPSUB;
+	pmModelSub (source->pixels, source->mask, model, false, false);
+	src->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+	src->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     }
     psFree (modelSet);
@@ -305,9 +304,9 @@
 
     psTrace ("psphot.blend", 5, "fitted primary as PSF\n");
-    pmSourceSubModel (source->pixels, source->mask, PSF, false, false);
+    pmModelSub (source->pixels, source->mask, PSF, false, false);
     psFree (source->modelPSF);
     source->modelPSF = PSF;
-    source->mode |=  PM_SOURCE_SUBTRACTED;
-    source->mode &= ~PM_SOURCE_TEMPSUB;
-    return true;
-}
+    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
+    return true;
+}