Changeset 29003

Timestamp:

Aug 20, 2010, 12:12:38 PM (16 years ago)

Author:

eugene

Message:

ensure masked pixels are NAN in output; flag detections with bright pos image neighbors

Location:

trunk/ppSub/src

Files:

• Makefile.am (modified) (1 diff)
• ppSub.h (modified) (1 diff)
• ppSubBackground.c (modified) (1 diff)
• ppSubFlagNeighbors.c (copied) (copied from branches/eam_branches/ipp-20100621/ppSub/src/ppSubFlagNeighbors.c )
• ppSubLoop.c (modified) (8 diffs)
• ppSubReadoutPhotometry.c (modified) (1 diff)
• ppSubReadoutSubtract.c (modified) (1 diff)

trunk/ppSub/src/Makefile.am

@@ -39 +39 @@
         ppSubDefineOutput.c             \
         ppSubExtras.c                   \
+        ppSubFlagNeighbors.c            \
         ppSubMakePSF.c                  \
         ppSubMatchPSFs.c                \

trunk/ppSub/src/ppSub.h

@@ -175 +175 @@
     );
 
+bool ppSubFlagNeighbors(pmConfig *config, pmFPAview *view, psArray *sources, bool matchRef);
+bool ppSubMatchSources (psArray *objects, psArray *sources, float RADIUS, float MIN_SN);
+bool ppSubSetSourceImageIDs (psArray *sources, int imageID);
+
 ///@}
 #endif

trunk/ppSub/src/ppSubBackground.c

@@ -67 +67 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
+            // special case 1: NAN the masked pixels
             if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskBad) {
-                image->data.F32[y][x] = 0.0;
-            } else {
-                float value = psImageUnbinPixel(x + 0.5, y + 0.5, modelImage, binning); // Background value
-                if (!isfinite(value)) {
-                    image->data.F32[y][x] = NAN;
-                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
-                } else {
-                    image->data.F32[y][x] -= value;
-                }
-            }
+                image->data.F32[y][x] = NAN;
+                continue;
+            } 
+            // special case 1: NAN & mask pixels without a valid background model
+            float value = psImageUnbinPixel(x + 0.5, y + 0.5, modelImage, binning); // Background value
+            if (!isfinite(value)) {
+              image->data.F32[y][x] = NAN;
+              mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
+              continue;
+            } 
+            image->data.F32[y][x] -= value;
         }
     }

trunk/ppSub/src/ppSubLoop.c

@@ -17 +17 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <psphot.h>
 
 #include "ppSub.h"
+
+bool dumpout(pmConfig *config, char *name) 
+{
+  pmFPAview *view = ppSubViewReadout(); // View to readout
+  pmReadout *out = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
+  psphotSaveImage (NULL, out->image, name);
+  return true;
+}
+
 
 bool ppSubLoop(ppSubData *data)
@@ -105 +115 @@
         return false;
     }
+    // dumpout(config, "diff.1.fits");
 
     // Close convolved files
@@ -111 +122 @@
         return false;
     }
+    // dumpout(config, "diff.2a.fits");
 
     // Higher order background subtraction using psphot
@@ -117 +129 @@
         return false;
     }
+    // dumpout(config, "diff.2b.fits");
 
     // Perform Variance correction (rescale within a modest range)
@@ -123 +136 @@
         return false;
     }
+    // dumpout(config, "diff.2c.fits");
 
     if (data->quality) {
@@ -138 +152 @@
         return false;
     }
+    // dumpout(config, "diff.3.fits");
 
     if (!ppSubFilesIterateUp(config, PPSUB_FILES_PHOT_SUB)) {
@@ -157 +172 @@
       }
     }
+    // dumpout(config, "diff.4.fits");
     
     // generate the binned image used to write the jpeg
@@ -204 +220 @@
     } else {
         // Close subtraction files
+        // dumpout(config, "diff.5.fits");
         if (!ppSubFilesIterateUp(config, PPSUB_FILES_SUB)) {
             psError(PPSUB_ERR_IO, false, "Unable to close subtraction files.");

trunk/ppSub/src/ppSubReadoutPhotometry.c

@@ -97 +97 @@
     psAssert (sources, "missing sources?");
 
+    // a likely source of false positives is poor subtractions.  this results in
+    // detections in the wings (or cores) of bright(er) stars found in both images.
+    // flag detections based on their distance from the bright(er) input sources.
+    bool matchRef = !strcasecmp(name, "PPSUB.INVERSE");
+    ppSubFlagNeighbors (config, view, sources, matchRef);
+
     if (data->stats) {
         bool mdok;

trunk/ppSub/src/ppSubReadoutSubtract.c

@@ -51 +51 @@
     outRO->variance = (psImage*)psBinaryOp(outRO->variance, minuend->variance, "+", subtrahend->variance);
 
+    // NAN the masked pixels in the diff image (pixels masked in A are not yet NAN'ed in B)
+    psImageMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config) | pmConfigMaskGet("BLANK", config); // Bits to mask in inputs
+    for (int iy = 0; iy < outRO->image->numRows; iy++) {
+        for (int ix = 0; ix < outRO->image->numCols; ix++) {
+            if ((outRO->mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskVal) == 0) continue;
+            outRO->image->data.F32[iy][ix] = NAN;
+        }
+    }
+
     // Measure the variance scales
     psStats *varStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN); // Statistics for variance images
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS);           // Random number generator
-    psImageMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config) |
-        pmConfigMaskGet("BLANK", config); // Bits to mask in inputs
     psImageBackground(varStats, NULL, minuend->variance, minuend->mask, maskVal, rng);
     float minuendVar = varStats->robustMedian; // Mean variance for minuend