Index: trunk/psphot/src/pspsf.c
===================================================================
--- trunk/psphot/src/pspsf.c	(revision 4949)
+++ trunk/psphot/src/pspsf.c	(revision 4954)
@@ -31,5 +31,5 @@
     }
 
-    p_psMemSetDeallocator(psf, (psFreeFcn) pmPSFFree);
+    psMemSetDeallocator(psf, (psFreeFunc) pmPSFFree);
     return(psf);
 }
@@ -74,5 +74,5 @@
     }	
 
-    p_psMemSetDeallocator(test, (psFreeFcn) pmPSF_TestFree);
+    psMemSetDeallocator(test, (psFreeFunc) pmPSF_TestFree);
     return (test);
 }
@@ -106,7 +106,7 @@
 	// set temporary object mask and fit object
 	// fit model as FLT, not PSF
-	psImageKeepCircle (source->mask, x, y, RADIUS, OR, 0x80);
+	psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PSPHOT_MASK_MARKED);
 	status = pmSourceFitModel (source, model, false);
-	psImageKeepCircle (source->mask, x, y, RADIUS, AND, 0x7f);
+	psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PSPHOT_MASK_MARKED);
 
 	// exclude the poor fits
@@ -142,5 +142,5 @@
 	y = source->peak->y;
 
-	psImageKeepCircle (source->mask, x, y, RADIUS, OR, 0x80);
+	psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PSPHOT_MASK_MARKED);
 	status = pmSourceFitModel (source, modelPSF, true);
 
@@ -168,5 +168,5 @@
 
     next_source:
-	psImageKeepCircle (source->mask, x, y, RADIUS, AND, 0x7f);
+	psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PSPHOT_MASK_MARKED);
 
     }