Changeset 24899

Timestamp:

Jul 22, 2009, 3:12:36 PM (17 years ago)

Author:

Paul Price

Message:

Mask row if we can't fit it.

Location:

trunk/psModules/src/detrend

Files:

• pmPattern.c (modified) (2 diffs)
• pmPattern.h (modified) (1 diff)

trunk/psModules/src/detrend/pmPattern.c

@@ -7 +7 @@
 
 
+// Mask a row as bad
+static void patternMaskRow(pmReadout *ro, // Readout to mask
+                           int y,         // Row to mask
+                           psImageMaskType bad // Mask value to give
+                           )
+{
+    psImage *image = ro->image;         // Image to mask
+    psAssert(image, "Require image");
+    psAssert(y < image->numRows, "Row not in image");
+
+    int numCols = image->numCols;       // Size of image
+    for (int x = 0; x < numCols; x++) {
+        image->data.F32[y][x] = NAN;
+    }
+    if (ro->mask) {
+        psImage *mask = ro->mask;       // Mask image to mask
+        for (int x = 0; x < numCols; x++) {
+            mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= bad;
+        }
+    }
+    return;
+}
+
 bool pmPatternRow(pmReadout *ro, int order, int iter, float rej,
-                  psStatsOptions clipMean, psStatsOptions clipStdev)
+                  psStatsOptions clipMean, psStatsOptions clipStdev,
+                  psImageMaskType maskBad)
 {
     PM_ASSERT_READOUT_NON_NULL(ro, false);
@@ -47 +71 @@
         if (num < order + 1) {
             // Not enough points to fit
+            patternMaskRow(ro, y, maskBad);
             continue;
         }
         if (!psVectorClipFitPolynomial1D(poly, clip, mask, 0xFF, data, NULL, indices)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to fit polynomial to row %d", y);
-            psFree(indices);
-            psFree(clip);
-            psFree(mask);
-            psFree(poly);
-            psFree(data);
-            return false;
+            psWarning("Unable to fit polynomial to row %d", y);
+            psErrorClear();
+            patternMaskRow(ro, y, maskBad);
+            continue;
         }
         psVector *solution = psPolynomial1DEvalVector(poly, indices); // Solution vector
         if (!solution) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to evaluate polynomial for row %d", y);
-            psFree(indices);
-            psFree(clip);
-            psFree(mask);
-            psFree(poly);
-            psFree(data);
-            return false;
+            psWarning("Unable to evaluate polynomial for row %d", y);
+            psErrorClear();
+            patternMaskRow(ro, y, maskBad);
+            continue;
         }
 

trunk/psModules/src/detrend/pmPattern.h

@@ -24 +24 @@
     int iter,                           ///< Number of clipping iterations
     float rej,                          ///< Rejection threshold for clipping
-    psStatsOptions clipMean,             ///< Statistic to use for mean
-    psStatsOptions clipStdev             ///< Statistic to use for standard deviation
+    psStatsOptions clipMean,            ///< Statistic to use for mean
+    psStatsOptions clipStdev,           ///< Statistic to use for standard deviation
+    psImageMaskType maskBad             ///< Mask value to give bad pixels
     );