Index: trunk/psphot/src/psphotFitGalaxies.c
===================================================================
--- trunk/psphot/src/psphotFitGalaxies.c	(revision 4949)
+++ trunk/psphot/src/psphotFitGalaxies.c	(revision 4954)
@@ -50,5 +50,7 @@
 
 	// recalculate the source moments using the larger galaxy moments radius
-	status = pmSourceMoments (source, GAL_MOMENTS_RAD);
+	// XXX EAM : 0.5.0 code used _EAM version
+	// status = pmSourceMoments (source, GAL_MOMENTS_RAD);
+	status = pmSourceMoments_EAM (source, GAL_MOMENTS_RAD);
 	if (!status) {
 	  source->type = PS_SOURCE_DROP_GALAXY;  // better choice?
@@ -74,7 +76,9 @@
 
 	// fit FLT (not PSF) model (set/unset the pixel mask)
-	psImageKeepCircle (source->mask, x, y, model->radius, OR, PSPHOT_MASK_KEEP);
+	psImageKeepCircle (source->mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
+	// XXX EAM : 0.5.0 code used _EAM version
+	// status = pmSourceFitModel (source, model, false);
 	status = pmSourceFitModel (source, model, false);
-	psImageKeepCircle (source->mask, x, y, model->radius, AND, ~PSPHOT_MASK_KEEP);
+	psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PSPHOT_MASK_MARKED);
 	if (!status) {
 	  // if the fit fails, we need to change the classification