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

Timestamp:

Apr 4, 2011, 1:12:39 PM (15 years ago)

Author:

eugene

Message:

use the smoothed image for footprint culling; use a more stringent culling for saturated stars; more tweaks to get sat stars to be fitted; various updates to psphotStack; unify psphotImageLoop varients; be a bit careful about number of stars in a PSF clump

Location:

trunk/psphot

Files:

• . (modified) (2 props)
• src/psphotReadout.c (modified) (8 diffs)

trunk/psphot

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

trunk/psphot/src/psphotReadout.c

@@ -9 +9 @@
 }
 
+// for now, let's store the detections on the readout->analysis for each readout
+bool psphotDumpChisqs (pmConfig *config, const pmFPAview *view, const char *filerule)
+{
+    static int npass = 0;
+    char filename[64];
+
+    return true;
+
+    bool status = true;
+
+    int num = psphotFileruleCount(config, filerule);
+
+    snprintf (filename, 64, "chisq.%02d.dat", npass);
+    FILE *f = fopen (filename, "w");
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        // find the currently selected readout
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, i); // File of interest
+        psAssert (file, "missing file?");
+
+        pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+        psAssert (readout, "missing readout?");
+
+        pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+        psAssert (detections, "missing detections?");
+
+        psArray *sources = detections->allSources;
+        psAssert (sources, "missing sources?");
+
+        for (int i = 0; i < sources->n; i++) {
+            pmSource *source = sources->data[i];
+            if (!source) continue;
+
+            pmModel *model = pmSourceGetModel (NULL, source);
+            if (!model) continue;
+        
+            if (source->mode & PM_SOURCE_MODE_NONLINEAR_FIT) {
+                fprintf (f, "%f %f %f %d %d %f  1 NONLINEAR\n", model->mag, model->params->data.F32[1], model->chisq, model->nDOF, model->nPix, model->chisqNorm);
+            } else {
+                fprintf (f, "%f %f %f %d %d %f  0 LINEAR\n", model->mag, model->params->data.F32[1], model->chisq, model->nDOF, model->nPix, model->chisqNorm);
+            }
+        }
+    }
+    fclose (f);
+    npass ++;
+
+    return true;
+}
+
 bool psphotReadout(pmConfig *config, const pmFPAview *view, const char *filerule) {
 
@@ -52 +103 @@
     }
 
+# if (0)
+    // XXX test to mask outliers, not very helpful
+    // mask the high values in the image (with MARK)
+    if (!psphotMaskBackground (config, view, filerule)) {
+        return psphotReadoutCleanup (config, view, filerule);
+    }
+
+    // generate a background model (median, smoothed image)
+    if (!psphotModelBackground (config, view, filerule)) {
+        return psphotReadoutCleanup (config, view, filerule);
+    }
+# endif
+
     if (!psphotSubtractBackground (config, view, filerule)) {
         return psphotReadoutCleanup (config, view, filerule);
@@ -83 +147 @@
 
     // find blended neighbors of very saturated stars (detections->newSources)
-    if (!psphotDeblendSatstars (config, view, filerule)) {
-        psError (PSPHOT_ERR_UNKNOWN, false, "failed on satstar deblend analysis");
-        return psphotReadoutCleanup (config, view, filerule);
-    }
+    // if (!psphotDeblendSatstars (config, view, filerule)) {
+    // psError (PSPHOT_ERR_UNKNOWN, false, "failed on satstar deblend analysis");
+    // return psphotReadoutCleanup (config, view, filerule);
+    // }
 
     // mark blended peaks PS_SOURCE_BLEND (detections->newSources)
@@ -134 +198 @@
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
     psphotFitSourcesLinear (config, view, filerule, false); // pass 1 (detections->allSources)
+    psphotDumpChisqs (config, view, filerule);
 
     // identify CRs and extended sources (only unmeasured sources are measured)
@@ -144 +209 @@
     // replace model flux, adjust mask as needed, fit, subtract the models (full stamp)
     psphotBlendFit (config, view, filerule); // pass 1 (detections->allSources)
+    psphotDumpChisqs (config, view, filerule);
 
     // replace all sources
@@ -151 +217 @@
     // NOTE : apply to ALL sources (extended + psf)
     psphotFitSourcesLinear (config, view, filerule, true); // pass 2 (detections->allSources)
+    psphotDumpChisqs (config, view, filerule);
 
     // if we only do one pass, skip to extended source analysis
@@ -157 +224 @@
     // NOTE: possibly re-measure background model here with objects subtracted / or masked
 
-    // add noise for subtracted objects
-    psphotAddNoise (config, view, filerule); // pass 1 (detections->allSources)
-
-    // find fainter sources
-    // NOTE: finds new peaks and new footprints, OLD and FULL set are saved on detections
-    psphotFindDetections (config, view, filerule, false); // pass 2 (detections->peaks, detections->footprints)
-
-    // remove noise for subtracted objects (ie, return to normal noise level)
-    // NOTE: this needs to operate only on the OLD sources
-    psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
-
-    // define new sources based on only the new peaks
-    // NOTE: new sources are saved on detections->newSources
-    psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
-
-    // set source type
-    // NOTE: apply only to detections->newSources
-    if (!psphotRoughClass (config, view, filerule)) { // pass 2 (detections->newSources)
-        psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
-        return psphotReadoutCleanup (config, view, filerule);
-    }
-
-    // create full input models, set the radius to fitRadius, set circular fit mask
-    // NOTE: apply only to detections->newSources
-    psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
-
-    // replace all sources so fit below applies to all at once
-    // NOTE: apply only to OLD sources (which have been subtracted)
-    psphotReplaceAllSources (config, view, filerule); // pass 2
-
-    // merge the newly selected sources into the existing list
-    // NOTE: merge OLD and NEW
-    // XXX check on free of sources...
-    psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
-
-    // NOTE: apply to ALL sources
-    psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+    // NOTE: this block performs the 2nd pass low-significance PSF detection stage
+    { 
+        // add noise for subtracted objects
+        psphotAddNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // find fainter sources
+        // NOTE: finds new peaks and new footprints, OLD and FULL set are saved on detections
+        psphotFindDetections (config, view, filerule, false); // pass 2 (detections->peaks, detections->footprints)
+
+        // remove noise for subtracted objects (ie, return to normal noise level)
+        // NOTE: this needs to operate only on the OLD sources
+        psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // define new sources based on only the new peaks
+        // NOTE: new sources are saved on detections->newSources
+        psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
+
+        // set source type
+        // NOTE: apply only to detections->newSources
+        if (!psphotRoughClass (config, view, filerule)) { // pass 2 (detections->newSources)
+            psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+            return psphotReadoutCleanup (config, view, filerule);
+        }
+
+        // create full input models, set the radius to fitRadius, set circular fit mask
+        // NOTE: apply only to detections->newSources
+        psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
+
+        // replace all sources so fit below applies to all at once
+        // NOTE: apply only to OLD sources (which have been subtracted)
+        psphotReplaceAllSources (config, view, filerule); // pass 2
+
+        // merge the newly selected sources into the existing list
+        // NOTE: merge OLD and NEW
+        // XXX check on free of sources...
+        psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // NOTE: apply to ALL sources
+        psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+        psphotDumpChisqs (config, view, filerule);
+    }
+
+    // NOTE: this block performs the 2nd pass low-significance EXT detection stage (smooth or rebin by NxN times PSF size)
+    if (0) { 
+        // add noise for subtracted objects
+        psphotAddNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // find fainter sources
+        // NOTE: finds new peaks and new footprints, OLD and FULL set are saved on detections
+        psphotFindDetections (config, view, filerule, false); // pass 2 (detections->peaks, detections->footprints)
+
+        // remove noise for subtracted objects (ie, return to normal noise level)
+        // NOTE: this needs to operate only on the OLD sources
+        psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // define new sources based on only the new peaks
+        // NOTE: new sources are saved on detections->newSources
+        psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
+
+        // set source type
+        // NOTE: apply only to detections->newSources
+        if (!psphotRoughClass (config, view, filerule)) { // pass 2 (detections->newSources)
+            psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+            return psphotReadoutCleanup (config, view, filerule);
+        }
+
+        // create full input models, set the radius to fitRadius, set circular fit mask
+        // NOTE: apply only to detections->newSources
+        psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
+
+        // replace all sources so fit below applies to all at once
+        // NOTE: apply only to OLD sources (which have been subtracted)
+        psphotReplaceAllSources (config, view, filerule); // pass 2
+
+        // merge the newly selected sources into the existing list
+        // NOTE: merge OLD and NEW
+        // XXX check on free of sources...
+        psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // NOTE: apply to ALL sources
+        psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+    }
 
 pass1finish:
@@ -203 +315 @@
     psphotExtendedSourceAnalysis (config, view, filerule); // pass 1 (detections->allSources)
     psphotExtendedSourceFits (config, view, filerule); // pass 1 (detections->allSources)
+    psphotRadialApertures(config, view, filerule);
 
 finish:

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM