Changeset 29215 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

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

Author:

eugene

Message:

replace pmSubtractionMaskInvalid with pmReadoutMaskInvalid (takes test and set masks); change stack mask to propagate good (or suspect) and bad pixel masks; replace test blocks with CHECKPIX test macro; replace robust median for window with sample median (less prone to fail)

File:

• branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionMatch.c (modified) (3 diffs)

branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionMatch.c

@@ -275 +275 @@
 }
 
-bool pmSubtractionMaskInvalid (const pmReadout *readout, psImageMaskType maskVal) {
-
-    if (!readout) return true;
-
-    psImage *image = readout->image;
-    psImage *mask  = readout->mask;
-    psImage *variance = readout->variance;
-    for (int y = 0; y < image->numRows; y++) {
-        for (int x = 0; x < image->numCols; x++) {
-            if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) continue;
-            bool valid = false;
-            valid = isfinite(image->data.F32[y][x]);
-            if (variance) {
-                valid &= isfinite(variance->data.F32[y][x]);
-            }
-            if (valid) continue;
-            mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] = maskVal;
-        }
-    }
-
-    return true;
-}
+// bool pmSubtractionMaskInvalid (const pmReadout *readout, psImageMaskType maskVal) {
+// 
+//     if (!readout) return true;
+// 
+//     psImage *image = readout->image;
+//     psImage *mask  = readout->mask;
+//     psImage *variance = readout->variance;
+//     for (int y = 0; y < image->numRows; y++) {
+//         for (int x = 0; x < image->numCols; x++) {
+//             if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) continue;
+//             bool valid = false;
+//             valid = isfinite(image->data.F32[y][x]);
+//             if (variance) {
+//                 valid &= isfinite(variance->data.F32[y][x]);
+//             }
+//             if (valid) continue;
+//             mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] = maskVal;
+//         }
+//     }
+// 
+//     return true;
+// }
 
 bool pmSubtractionMatchPrecalc(pmReadout *conv1, pmReadout *conv2, const pmReadout *ro1, const pmReadout *ro2,
@@ -387 +387 @@
     }
 
-    pmSubtractionMaskInvalid(ro1, maskVal);
-    pmSubtractionMaskInvalid(ro2, maskVal);
+    // XXX this is done before calling this function
+    // pmSubtractionMaskInvalid(ro1, maskVal);
+    // pmSubtractionMaskInvalid(ro2, maskVal);
 
     // General background subtraction, since this is done in pmSubtractionMatch
@@ -560 +561 @@
     memCheck("start");
 
-    pmSubtractionMaskInvalid(ro1, maskVal);
-    pmSubtractionMaskInvalid(ro2, maskVal);
+    // pmSubtractionMaskInvalid(ro1, maskVal);
+    // pmSubtractionMaskInvalid(ro2, maskVal);
 
     psRegion bounds = psRegionSet(NAN, NAN, NAN, NAN); // Bounds of valid pixels