Index: trunk/psphot/src/psphot.c
===================================================================
--- trunk/psphot/src/psphot.c	(revision 5773)
+++ trunk/psphot/src/psphot.c	(revision 5802)
@@ -46,13 +46,4 @@
     pmSourceRoughClass (sources, config, psfClump);
 
-    // optional dump of all rough source data
-    char *output = psMetadataLookupPtr (&status, config, "MOMENTS_OUTPUT_FILE");
-    if (status && (output != NULL) && (output[0]))
-    {
-      pmMomentsWriteText (sources, output);
-      psFree (output);
-    }
-    if (!strcasecmp (breakPt, "CLASS")) exit (0);
-
     // mark blended peaks PS_SOURCE_BLEND
     psphotBasicDeblend (sources, config, sky);
@@ -61,4 +52,7 @@
     // source analysis is done in S/N order (brightest first)
     sources = psArraySort (sources, psphotSortBySN);
+
+    psphotDumpMoments (config, sources);
+    if (!strcasecmp (breakPt, "CLASS")) exit (0);
 
     // use bright stellar objects to measure PSF
@@ -75,9 +69,14 @@
       case 0:
 	psphotEnsemblePSF (imdata, config, sources, psf, sky);
-	psphotFullFit (imdata, config, sources, psf, sky);
-//	psphotReplaceUnfit (sources);
 	break;
 
       case 1:
+	psphotEnsemblePSF (imdata, config, sources, psf, sky);
+	psphotFullFit (imdata, config, sources, psf, sky);
+	psphotReplaceUnfit (sources);
+	psphotApResid (sources, config, psf);
+	break;
+
+      case 2:
 	// fit extended objects with galaxy models
 	psphotApplyPSF (imdata, config, sources, psf, sky);
@@ -85,10 +84,10 @@
 	break;
 
-      case 2:
+      case 3:
 	// fit extended objects with galaxy models
 	psphotApplyPSF (imdata, config, sources, psf, sky);
 	break;
 
-      case 3:
+      case 4:
 	// fit extended objects with galaxy models
 	psphotFixedPSF (imdata, config, sources, psf, sky);