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

Timestamp:

Jun 19, 2007, 4:40:44 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested with psModules (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels. For
this reason, I have left the "gutter" pixels (cell gaps) set to 0
instead of NAN in pmFPAMosaic.

File:

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

trunk/psphot/src/psphotReadout.c

@@ -12 +12 @@
     }
 
+    // Interpret the mask values
+    const char *maskValStr = psMetadataLookupStr(NULL, recipe, "MASKVAL"); // String with mask names
+    if (!maskValStr) {
+        psError(PSPHOT_ERR_CONFIG, false, "Missing recipe item: MASKVAL(STR)");
+        return false;
+    }
+    psMaskType maskVal = pmConfigMask(maskValStr, config); // Mask values to mask against
+    psMaskType maskMark = pmConfigMask("MARK", config); // Mask value for marking
+    psMaskType maskSat = pmConfigMask("SAT", config); // Mask value for saturated pixels
+    psMaskType maskBad = pmConfigMask("BAD", config); // Mask value for bad pixels
+
     // find the currently selected readout
     pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT");
@@ -24 +35 @@
 
     // generate mask & weight images if they don't already exit
-    psMaskType satMask = pmConfigMask("SAT", config);
-    psMaskType badMask = pmConfigMask("BAD", config);
     if (!readout->mask) {
-        if (!pmReadoutGenerateMask(readout, satMask, badMask)) {
-            psError (PSPHOT_ERR_CONFIG, false, "trouble creating mask");
-            return false;
-        }
+        if (!pmReadoutGenerateMask(readout, maskSat, maskBad)) {
+            psError (PSPHOT_ERR_CONFIG, false, "trouble creating mask");
+            return false;
+        }
     }
     if (!readout->weight) {
-        if (!pmReadoutGenerateWeight(readout, true)) {
-            psError (PSPHOT_ERR_CONFIG, false, "trouble creating weight");
-            return false;
-        }
+        if (!pmReadoutGenerateWeight(readout, true)) {
+            psError (PSPHOT_ERR_CONFIG, false, "trouble creating weight");
+            return false;
+        }
     }
 
@@ -46 +55 @@
 
     // I have a valid mask, now mask in the analysis region of interest
-    psphotMaskReadout (readout, recipe, config);
+    psphotMaskReadout (readout, recipe, maskBad);
 
     // run a single-model test if desired
-    psphotModelTest (readout, recipe);
+    psphotModelTest (readout, recipe, maskVal, maskMark);
 
     if (psTraceGetLevel("psphot") >= 5) {
@@ -62 +71 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotImageMedian (config, view)) {
+    if (!psphotImageMedian (config, view, maskVal)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL);
     }
@@ -74 +83 @@
     psArray *footprints = NULL;
     if (useFootprints) {
-       footprints = psphotFindPeaks (readout, recipe, useFootprints, 1);
+       footprints = psphotFindPeaks (readout, recipe, useFootprints, 1, maskVal);
        int growRadius = psMetadataLookupS32(NULL, recipe, "FOOTPRINT_GROW_RADIUS");
        if (growRadius > 0) {
@@ -85 +94 @@
        peaks = pmFootprintArrayToPeaks(footprints);
     } else {
-       peaks = psphotFindPeaks (readout, recipe, useFootprints, 1);
+       peaks = psphotFindPeaks (readout, recipe, useFootprints, 1, maskVal);
     }
 
@@ -97 +106 @@
 
     // construct sources and measure basic stats
-    psArray *sources = psphotSourceStats (readout, recipe, peaks);
+    psArray *sources = psphotSourceStats (readout, recipe, peaks, maskVal, maskMark);
     if (!sources) return false;
     psFree (peaks);
@@ -114 +123 @@
 
     // classify sources based on moments, brightness
-    if (!psphotRoughClass (sources, recipe, true)) {
+    if (!psphotRoughClass (sources, recipe, true, maskSat)) {
         psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
         return psphotReadoutCleanup (config, readout, recipe, NULL, sources);
@@ -126 +135 @@
     if (!psf) {
         // use bright stellar objects to measure PSF
-        psf = psphotChoosePSF (readout, sources, recipe);
+        psf = psphotChoosePSF (readout, sources, recipe, maskVal, maskMark);
         if (psf == NULL) {
             psLogMsg ("psphot", 3, "failure to construct a psf model");
@@ -143 +152 @@
 
     // construct an initial model for each object
-    psphotGuessModels (readout, sources, recipe, psf);
+    psphotGuessModels (readout, sources, recipe, psf, maskVal);
 
     // XXX test output of models
@@ -151 +160 @@
 
     // linear PSF fit to peaks
-    psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE);
+    psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE, maskVal);
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v1.fits");
 
@@ -162 +171 @@
 
     // non-linear PSF and EXT fit to brighter sources
-    psphotBlendFit (readout, sources, recipe, psf);
+    psphotBlendFit (readout, sources, recipe, psf, maskVal);
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v2.fits");
 
     // replace all sources
-    psphotReplaceAll (sources);
+    psphotReplaceAll (sources, maskVal);
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v3.fits");
 
     // linear PSF fit to remaining peaks
-    psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
+    psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE, maskVal);
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v4.fits");
     if (!strcasecmp (breakPt, "PASS1")) {
@@ -183 +192 @@
 
     // add noise for subtracted objects
-    psphotAddNoise (readout, sources, recipe, true);
+    psphotAddNoise (readout, sources, recipe, true, maskVal);
 
     // find the peaks in the image
     psArray *newPeaks;
     if (useFootprints) {
-       psArray *newFootprints = psphotFindPeaks (readout, recipe, useFootprints, 2);
+       psArray *newFootprints = psphotFindPeaks (readout, recipe, useFootprints, 2, maskVal);
 
        int growRadius = psMetadataLookupS32(NULL, recipe, "FOOTPRINT_GROW_RADIUS_2");
@@ -209 +218 @@
        psFree(mergedFootprints);
     } else {
-       newPeaks = psphotFindPeaks(readout, recipe, useFootprints, 2);
+       newPeaks = psphotFindPeaks(readout, recipe, useFootprints, 2, maskVal);
     }
 
     // remove noise for subtracted objects
-    psphotAddNoise (readout, sources, recipe, false);
+    psphotAddNoise (readout, sources, recipe, false, maskVal);
 
     // define new sources based on the new peaks
-    psArray *newSources = psphotSourceStats (readout, recipe, newPeaks);
+    psArray *newSources = psphotSourceStats (readout, recipe, newPeaks, maskVal, maskMark);
     psFree (newPeaks);
 
     // set source type
-    psphotRoughClass (newSources, recipe, false);
+    psphotRoughClass (newSources, recipe, false, maskSat);
 
     // create full input models
-    psphotGuessModels (readout, newSources, recipe, psf);
+    psphotGuessModels (readout, newSources, recipe, psf, maskVal);
 
     // replace all sources
-    psphotReplaceAll (sources);
+    psphotReplaceAll (sources, maskVal);
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v5.fits");
 
@@ -234 +243 @@
 
     // linear PSF fit to remaining peaks
-    psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
+    psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE, maskVal);
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v6.fits");
 
@@ -243 +252 @@
 
     // measure aperture photometry corrections
-    if (!psphotApResid (readout, sources, recipe, psf)) {
+    if (!psphotApResid (readout, sources, recipe, psf, maskVal, maskMark)) {
         psTrace ("psphot", 4, "failure on psphotApResid");
         psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
@@ -251 +260 @@
     // calculate source magnitudes
     pmReadout *background = psphotSelectBackground (config, view, false);
-    psphotMagnitudes(sources, recipe, psf, background);
+    psphotMagnitudes(sources, recipe, psf, background, maskVal, maskMark);
 
     // replace failed sources?