Changeset 19911

Timestamp:

Oct 6, 2008, 3:12:51 AM (18 years ago)

Author:

eugene

Message:

move visualization down one level; new APIs for psphotRoughClass and psphotMagnitudes; adding psphotImageQuality

File:

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

trunk/psphot/src/psphotReadout.c

@@ -36 +36 @@
     }
 
-    // set up the Visual display, display the image, weight, mask (ch 1,2,3)
-    psphotVisualShowImage (config, readout);
+    // display the image, weight, mask (ch 1,2,3)
+    psphotVisualShowImage (readout);
 
     // generate a background model (median, smoothed image)
@@ -69 +69 @@
     }
  
-    // display the peaks and footprints
-    psphotVisualShowPeaks (config, view, detections);
-    psphotVisualShowFootprints (config, view, detections);
-
     // construct sources and measure basic stats
     psArray *sources = psphotSourceStats (readout, recipe, detections);
@@ -80 +76 @@
     }
 
-    psphotVisualShowMoments (config, view, sources);
-
     // find blended neighbors of very saturated stars
     // XXX merge this with Basic Deblend?
@@ -93 +87 @@
 
     // classify sources based on moments, brightness
-    if (!psphotRoughClass (sources, recipe, havePSF)) {
+    if (!psphotRoughClass (readout, sources, recipe, havePSF)) {
         psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
         return psphotReadoutCleanup (config, readout, recipe, detections, psf, sources);
@@ -101 +95 @@
     }
 
-    psphotVisualShowRoughClass (config, view, sources);
-    psphotVisualShowFlags (config, view, sources);
+    psphotImageQuality (recipe, sources);
 
     // if we were not supplied a PSF, choose one here
@@ -120 +113 @@
     }
 
-    psphotVisualShowPSFModel (config, readout, psf);
+    psphotVisualShowPSFModel (readout, psf);
 
     // Define source fitting parameters for everything that follows PSF fits
@@ -161 +154 @@
     psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE);
 
-    // XXX we have to place this here because the models are not realized until psphotGuessModels
-    // or fitted until psphotFitSourcesLinear.  There is an example of generating a residual image 
-    // in pmPSFtry.c
-
-    psphotVisualShowPSFStars (config, view, psf, sources);
-    psphotVisualShowSatStars (config, view, psf, sources);
-    psphotVisualShowResidualImage (config, readout);
-    psphotVisualShowFlags (config, view, sources);
+    // We have to place these visualizations here because the models are not realized until
+    // psphotGuessModels or fitted until psphotFitSourcesLinear.
+    psphotVisualShowPSFStars (recipe, psf, sources);
+    psphotVisualShowSatStars (recipe, psf, sources);
 
     // identify CRs and extended sources
@@ -176 +165 @@
     }
 
-    psphotVisualPlotSourceSize (config, sources);
-    psphotVisualShowSourceSize (config, view, sources);
-
     // non-linear PSF and EXT fit to brighter sources
     psphotBlendFit (readout, sources, recipe, psf);
 
-    psphotVisualShowResidualImage (config, readout);
-    psphotVisualShowFlags (config, view, sources);
-
     // replace all sources
     psphotReplaceAllSources (sources, recipe);
@@ -190 +173 @@
     // linear fit to include all sources
     psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
-
-    psphotVisualShowResidualImage (config, readout);
-    psphotVisualShowFlags (config, view, sources);
 
     // if we only do one pass, skip to extended source analysis
@@ -214 +194 @@
     psphotSubNoise (readout, sources, recipe);
 
-    // display the new peaks and footprints
-    psphotVisualShowPeaks (config, view, detections);
-    psphotVisualShowFootprints (config, view, detections);
-
     // define new sources based on only the new peaks
     psArray *newSources = psphotSourceStats (readout, recipe, detections);
 
     // set source type
-    if (!psphotRoughClass (newSources, recipe, havePSF)) {
+    if (!psphotRoughClass (readout, newSources, recipe, havePSF)) {
         psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
         return psphotReadoutCleanup (config, readout, recipe, detections, psf, sources);
     }
-
-    psphotVisualShowRoughClass (config, view, sources);
-    psphotVisualShowFlags (config, view, sources);
 
     // create full input models
@@ -243 +216 @@
     psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
 
-    psphotVisualShowResidualImage (config, readout);
-    psphotVisualShowFlags (config, view, sources);
-
 pass1finish:
 
     // measure source size for the remaining sources
     psphotSourceSize (config, readout, sources, recipe, 0);
-    psphotVisualPlotSourceSize (config, sources);
-    psphotVisualShowSourceSize (config, view, sources);
 
     psphotExtendedSourceAnalysis (readout, sources, recipe);
@@ -268 +236 @@
     }
 
-    psphotVisualPlotApResid (config, sources);
-
     // calculate source magnitudes
-    pmReadout *background = psphotSelectBackground (config, view, false);
-    psphotMagnitudes(sources, recipe, psf, background);
+    psphotMagnitudes(config, view, sources, recipe, psf);
 
     // replace failed sources?