Changeset 12689 for trunk/psphot/src/psphotReadout.c

Timestamp:

Mar 29, 2007, 4:48:20 PM (19 years ago)

Author:

eugene

Message:

added deblend for saturated stars, fixed AddNoise

File:

• trunk/psphot/src/psphotReadout.c (modified) (6 diffs)

trunk/psphot/src/psphotReadout.c

@@ -61 +61 @@
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL);
     }
+    pmPeaksWriteText (peaks, "oldpeaks.dat");
 
     // construct sources and measure basic stats
@@ -70 +71 @@
         return psphotReadoutCleanup(config, readout, recipe, NULL, sources);
     }
+
+    psphotDeblendSatstars (sources, recipe);
 
     // mark blended peaks PS_SOURCE_BLEND
@@ -102 +105 @@
     psphotGuessModels (readout, sources, recipe, psf);
 
+    psphotSaveImage (NULL, readout->image,  "image.v0.fits");
+
     // linear PSF fit to peaks
     psphotEnsemblePSF (readout, sources, recipe, psf, FALSE);
+    psphotSaveImage (NULL, readout->image,  "image.v1.fits");
     if (!strcasecmp (breakPt, "ENSEMBLE")) {
         goto finish;
     }
 
-    // plot positive + negative sources (replace, then remove)
-    psphotSourcePlots (readout, sources, recipe);
-
     // non-linear PSF and EXT fit to brighter sources
     psphotBlendFit (readout, sources, recipe, psf);
+    psphotSaveImage (NULL, readout->image,  "image.v2.fits");
 
     // replace all sources
     psphotReplaceAll (sources);
-
-    // plot positive sources 
-    // psphotSourcePlots (readout, sources, recipe);
+    psphotSaveImage (NULL, readout->image,  "image.v3.fits");
 
     // linear PSF fit to remaining peaks
     psphotEnsemblePSF (readout, sources, recipe, psf, TRUE);
+    psphotSaveImage (NULL, readout->image,  "image.v4.fits");
     if (!strcasecmp (breakPt, "PASS1")) {
         goto finish;
@@ -137 +140 @@
     // find the peaks in the image
     psArray *newPeaks = psphotFindPeaks (readout, recipe, 2);
+    pmPeaksWriteText (newPeaks, "newpeaks.dat");
 
     // remove noise for subtracted objects
@@ -153 +157 @@
     // replace all sources
     psphotReplaceAll (sources);
+    psphotSaveImage (NULL, readout->image,  "image.v5.fits");
 
     // merge the newly selected peaks into the existing list
@@ -160 +165 @@
     // linear PSF fit to remaining peaks
     psphotEnsemblePSF (readout, sources, recipe, psf, TRUE);
+    psphotSaveImage (NULL, readout->image,  "image.v6.fits");
 
 finish:
+
+    // plot positive sources 
+    psphotSourcePlots (readout, sources, recipe);
 
     // measure aperture photometry corrections