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

Timestamp:

Oct 2, 2009, 3:12:47 PM (17 years ago)

Author:

eugene

Message:

check in changes from gene@development branch : extensive changes to moments calculation, psf model generation, aperture residuals; improvements to extended source analysis

Location:

trunk/psphot/src

Files:

• . (modified) (1 prop)
• psphotReadout.c (modified) (9 diffs)

trunk/psphot/src

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

trunk/psphot/src/psphotReadout.c

@@ -81 +81 @@
 
     // construct sources and measure basic stats
-    psArray *sources = psphotSourceStats (config, readout, detections);
+    psArray *sources = psphotSourceStats (config, readout, detections, true);
     if (!sources) return false;
     if (!strcasecmp (breakPt, "PEAKS")) {
@@ -126 +126 @@
         return psphotReadoutCleanup (config, readout, recipe, detections, psf, sources);
     }
-
     psphotVisualShowPSFModel (readout, psf);
 
@@ -132 +131 @@
     psphotLoadExtSources (config, view, sources);
 
-    // construct an initial model for each object
+    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
     psphotGuessModels (config, readout, sources, psf);
 
-    // XXX test output of models
-    // psphotTestSourceOutput (readout, sources, recipe, psf);
-
-    // linear PSF fit to source peaks
+    // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
     psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE);
 
@@ -144 +140 @@
     // psphotGuessModels or fitted until psphotFitSourcesLinear.
     psphotVisualShowPSFStars (recipe, psf, sources);
-    psphotVisualShowSatStars (recipe, psf, sources);
 
     // identify CRs and extended sources
-    psphotSourceSize (config, readout, sources, recipe, 0);
+    psphotSourceSize (config, readout, sources, recipe, psf, 0);
     if (!strcasecmp (breakPt, "ENSEMBLE")) {
         goto finish;
     }
+    psphotVisualShowSatStars (recipe, psf, sources);
 
     // non-linear PSF and EXT fit to brighter sources
+    // replace model flux, adjust mask as needed, fit, subtract the models (full stamp)
     psphotBlendFit (config, readout, sources, psf);
 
@@ -158 +155 @@
     psphotReplaceAllSources (sources, recipe);
 
-    // linear fit to include all sources
+    // linear fit to include all sources (subtract again)
     psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
 
@@ -165 +162 @@
         goto pass1finish;
     }
-
-    // XXX for the moment, drop the re-calc of the background (prove this works)
-    // replace background in residual image
-    // psphotSkyReplace (config, view);
-    // re-measure background model (median, smoothed image)
-    // psphotImageMedian (config, view);
+    // NOTE: possibly re-measure background model here with objects subtracted
 
     // add noise for subtracted objects
@@ -182 +174 @@
 
     // define new sources based on only the new peaks
-    psArray *newSources = psphotSourceStats (config, readout, detections);
+    psArray *newSources = psphotSourceStats (config, readout, detections, false);
 
     // set source type
@@ -190 +182 @@
     }
 
-    // create full input models
+    // create full input models, set the radius to fitRadius, set circular fit mask
     psphotGuessModels (config, readout, newSources, psf);
 
@@ -206 +198 @@
 
     // measure source size for the remaining sources
-    psphotSourceSize (config, readout, sources, recipe, 0);
+    psphotSourceSize (config, readout, sources, recipe, psf, 0);
 
     psphotExtendedSourceAnalysis (readout, sources, recipe);

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy