Changeset 18364 for trunk/psModules/src/detrend/pmMaskBadPixels.c

Timestamp:

Jun 29, 2008, 2:53:45 PM (18 years ago)

Author:

eugene

Message:

defer construction of blank of concepts until element is used

File:

• trunk/psModules/src/detrend/pmMaskBadPixels.c (modified) (5 diffs)

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -100 +100 @@
     if (suspect) {
         PS_ASSERT_IMAGE_NON_EMPTY(suspect, false);
-        PS_ASSERT_IMAGE_TYPE(suspect, PS_TYPE_S32, false);
+        PS_ASSERT_IMAGE_TYPE(suspect, PS_TYPE_F32, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(readout->image, suspect, false);
         psMemIncrRefCounter(suspect);
     } else {
-        suspect = psImageAlloc(readout->image->numCols, readout->image->numRows, PS_TYPE_S32);
+        suspect = psImageAlloc(readout->image->numCols, readout->image->numRows, PS_TYPE_F32);
         psImageInit(suspect, 0);
         psMetadataAddImage(output->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_SUSPECT, PS_META_REPLACE,
@@ -115 +115 @@
         // If we get down here and the statistics are missing, then we should go and mask the entire image
         psWarning("Missing statistics --- flagging entire image as suspect.");
-        return (psImage*)psBinaryOp(suspect, suspect, "+", psScalarAlloc(1.0, PS_TYPE_S32));
+        return (psImage*)psBinaryOp(suspect, suspect, "+", psScalarAlloc(1.0, PS_TYPE_F32));
     }
 
@@ -126 +126 @@
         for (int x = 0; x < image->numCols; x++) {
             if (fabs((image->data.F32[y][x] - median) / stdev) >= rej &&
-                    (!mask || !(mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal))) {
-                suspect->data.S32[y][x]++;
+                (!mask || !(mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal))) {
+                suspect->data.F32[y][x] += 1.0;
             }
         }
@@ -149 +149 @@
     }
     PS_ASSERT_IMAGE_NON_EMPTY(suspects, false);
-    PS_ASSERT_IMAGE_TYPE(suspects, PS_TYPE_S32, false);
+    PS_ASSERT_IMAGE_TYPE(suspects, PS_TYPE_F32, false);
     if (output->mask) {
         PS_ASSERT_IMAGE_NON_EMPTY(output->mask, false);
@@ -243 +243 @@
     for (int y = 0; y < suspects->numRows; y++) {
         for (int x = 0; x < suspects->numCols; x++) {
-            if (suspects->data.S32[y][x] >= limit) {
+            if (suspects->data.F32[y][x] >= limit) {
                 badpix->data.PS_TYPE_MASK_DATA[y][x] = maskVal;
             }