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

Timestamp:

Feb 14, 2006, 6:33:17 AM (20 years ago)

Author:

eugene

Message:

mods to change from threshold above sky to S/N thresholds

File:

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

trunk/psphot/src/psphotReadout.c

@@ -4 +4 @@
 bool psphotReadout (pmReadout *readout, psMetadata *config) {
 
-    psArray     *sources = NULL;
-    psArray     *peaks   = NULL;
-    pmPSF       *psf     = NULL;
-    psStats     *sky     = NULL;
+    psArray     *sources  = NULL;
+    psArray     *peaks    = NULL;
+    psImage     *skymodel = NULL;
+    pmPSF       *psf      = NULL;
     bool         status;
-    psPolynomial2D *model = NULL;
 
-    psphotImageMedian (readout, config, sky);
-
-    // measure image stats for initial guess 
-    sky = psphotImageStats (readout, config);
-
-    // generate a background model (currently, 2D polynomial)
-    // XXX this should be available to be re-added to the original image
-    model = psphotImageBackground (readout, config, sky);
+    // generate a background model (median, smoothed image)
+    skymodel = psphotImageMedian (readout, config);
 
     // find the peaks in the image
-    peaks = psphotFindPeaks (readout, config, sky);
+    peaks = psphotFindPeaks (readout, config);
 
     // construct sources and measure basic stats
@@ -30 +23 @@
 
     // mark blended peaks PS_SOURCE_BLEND
-    psphotBasicDeblend (sources, config, sky);
+    psphotBasicDeblend (sources, config);
 
     // use bright stellar objects to measure PSF
-    psf = psphotChoosePSF (config, sources, sky);
+    psf = psphotChoosePSF (config, sources);
 
-    // XXX change FITMODE to a string
+    // select analysis method
     char *FITMODE = psMetadataLookupStr (&status, config, "FITMODE");
     if (!strcasecmp(FITMODE, "ENSEMBLE")) {
-        psphotEnsemblePSF (readout, config, sources, psf, sky);
-    }
-
-    if (!strcasecmp(FITMODE, "FULL")) {
-        psphotEnsemblePSF (readout, config, sources, psf, sky);
-        psphotFullFit (readout, config, sources, psf, sky);
-        psphotReplaceUnfit (sources);
-        psphotApResid (readout, sources, config, psf);
+        psphotEnsemblePSF (readout, config, sources, psf);
     }
 
     if (!strcasecmp(FITMODE, "BLEND")) {
-        psphotEnsemblePSF (readout, config, sources, psf, sky);
-        psphotBlendFit (readout, config, sources, psf, sky);
+        psphotEnsemblePSF (readout, config, sources, psf);
+        psphotBlendFit (readout, config, sources, psf);
         psphotReplaceUnfit (sources);
         psphotApResid (readout, sources, config, psf);
-    }
-
-    if (!strcasecmp(FITMODE, "BASIC")) {
-        psphotApplyPSF (readout, config, sources, psf, sky);
-        psphotFitExtended (readout, config, sources, sky);
     }
 
@@ -65 +46 @@
     psphotUpdateHeader (header, config);
 
+    // psphotSkyReplace (readout, skymodel);
+
     // need to do something with the sources, psf, and sky
     status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES",   PS_DATA_ARRAY,   "psphot sources", sources);
     status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF",       PS_DATA_UNKNOWN, "psphot psf", psf);
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SKY.MEAN",  PS_DATA_F32,     "psphot sky mean", sky->sampleMean);
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SKY.SIGMA", PS_DATA_F32,     "psphot sky stdev", sky->sampleStdev);
+    // XXX : replace? status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SKY.MEAN",  PS_DATA_F32,     "psphot sky mean", sky->sampleMean);
+    // XXX : replace? status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SKY.SIGMA", PS_DATA_F32,     "psphot sky stdev", sky->sampleStdev);
 
     // free up the local copies of the data
     psFree (psf);
-    psFree (sky);
-    psFree (model);
     psFree (peaks);
     psFree (sources);
+    psFree (skymodel);
 
     return true;
 }
+
+
+// XXX Deprecate or allow these versions?
+# if (0)
+    if (!strcasecmp(FITMODE, "FULL")) {
+        psphotEnsemblePSF (readout, config, sources, psf);
+        psphotFullFit (readout, config, sources, psf);
+        psphotReplaceUnfit (sources);
+        psphotApResid (readout, sources, config, psf);
+    }
+
+    if (!strcasecmp(FITMODE, "BASIC")) {
+        psphotApplyPSF (readout, config, sources, psf);
+        psphotFitExtended (readout, config, sources);
+    }
+
+# endif