Changeset 29217 for branches/eam_branches/ipp-20100823/ppStack/src/ppStackMatch.c

Timestamp:

Sep 23, 2010, 7:08:16 AM (16 years ago)

Author:

eugene

Message:

more clearly distinguish mask used to test for bad pixels from mask value used to set possibly blank pixels; do not fail is no covariances are supplied; replace instance of psMetadataAddU8 with psMetadataAddImageMask; replace pmReadoutMaskNonfinite with pmReadoutMaskInvalid (only masks unmasked nan pixels)

File:

• branches/eam_branches/ipp-20100823/ppStack/src/ppStackMatch.c (modified) (2 diffs)

branches/eam_branches/ipp-20100823/ppStack/src/ppStackMatch.c

@@ -68 +68 @@
 
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
-    psMetadataAddU8(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskBad);
+    psMetadataAddImageMask(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskBad);
 
     psImage *binned = psphotModelBackgroundReadoutNoFile(ro, config); // Binned background model
@@ -153 +153 @@
     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
 
-    if (!pmReadoutMaskNonfinite(readout, maskVal)) {
+    // Replaced pmReadoutMaskNonfinite with pmReadoutMaskInvalid (tests for already masked pixels)
+    if (!pmReadoutMaskInvalid(readout, maskVal, maskBad)) {
         psError(psErrorCodeLast(), false, "Unable to mask non-finite pixels in readout.");
         return false;