Changeset 32157 for branches/eam_branches/ipp-20110710/psphot/src/psphotReadout.c

Timestamp:

Aug 21, 2011, 10:44:17 AM (15 years ago)

Author:

eugene

Message:

distinguish window used for moment calculation and window used for model fitting more clearly; re-generate the cached model after PCM fitting using new function (instead of caching the fit models); add function to set window which shrinks as well as expands as needed

Location:

branches/eam_branches/ipp-20110710/psphot/src

Files:

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

branches/eam_branches/ipp-20110710/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/eam_branches/ipp-20110710/psphot/src/psphotReadout.c

@@ -137 +137 @@
     }
 
-    // construct sources and measure basic stats (saved on detections->newSources)
+    // construct sources and measure moments and other basic stats (saved on detections->newSources)
+    // all sources use the auto-scaled window appropriate to a PSF, except for the saturated
+    // stars : these use a larger window (3x the basic window)
     if (!psphotSourceStats (config, view, filerule, true)) { // pass 1
         psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
@@ -200 +202 @@
     psphotDumpChisqs (config, view, filerule);
 
-    // XXX re-measure the kron mags with models subtracted
+    // re-measure the kron mags with models subtracted.  this pass uses a circular window of size PSF_MOMENTS_RADIUS (same window used to measure the psf-scale moments)
+    
+    // but this is chosen above to be appropriate for the PSF objects (not galaxies)
     psphotKronMasked(config, view, filerule);
 
@@ -214 +218 @@
     psphotDumpChisqs (config, view, filerule);
 
+    // XXX note above the extended sources have their moments remeasured with a larger window,
+    // but the result is replaced with the original PSF-scaled window
+
     // replace all sources
     psphotReplaceAllSources (config, view, filerule); // pass 1 (detections->allSources)
@@ -240 +247 @@
         psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
 
-        // define new sources based on only the new peaks
+        // define new sources based on only the new peaks & measure moments
         // NOTE: new sources are saved on detections->newSources
         psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
@@ -313 +320 @@
 
     // XXX re-measure the kron mags with models subtracted
+    // Note that this uses the PSF_MOMENTS_RADIUS as a window
     psphotKronMasked(config, view, filerule);
 

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest