Changeset 5802 for trunk/psphot/src/psphot.c

Timestamp:

Dec 17, 2005, 10:26:59 AM (21 years ago)

Author:

eugene

Message:

clean up of small accounting bugs, adding the post-subtraction ApResid

File:

• trunk/psphot/src/psphot.c (modified) (4 diffs)

trunk/psphot/src/psphot.c

@@ -46 +46 @@
     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 +52 @@
     // 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 +69 @@
       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 +84 @@
         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);