Changeset 15862

Timestamp:

Dec 16, 2007, 12:20:45 PM (18 years ago)

Author:

eugene

Message:

added mode option for masking

Location:

trunk/ppMerge/src

Files:

• ppMergeMask.c (modified) (1 diff)
• ppMergeOptions.c (modified) (2 diffs)
• ppMergeOptions.h (modified) (1 diff)

trunk/ppMerge/src/ppMergeMask.c

@@ -110 +110 @@
 
             pmReadout *roOut = pmReadoutAlloc(cellOut); // Output readout
-            roOut->mask = pmMaskIdentifyBadPixels(suspect, options->maskBad, options->combine->maskVal);
+            roOut->mask = pmMaskIdentifyBadPixels(suspect, options->combine->maskVal, filenames->n, options->maskBad, options->maskMode);
             roOut->data_exists = cellOut->data_exists = chipOut->data_exists = true;
 

trunk/ppMerge/src/ppMergeOptions.c

@@ -50 +50 @@
     options->maskSuspect = 5.0;
     options->maskBad = 10.0;
+    options->maskMode = PM_MASK_ID_VALUE;
     options->onOff = 0;
     options->combine = pmCombineParamsAlloc(PS_STAT_SAMPLE_MEAN);
@@ -235 +236 @@
     }
 
+    const char *maskMode = psMetadataLookupStr(NULL, recipe, "MASK.MODE"); // The type of calibration frame
+    if (!maskMode) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "No mask mode specified in recipe.");
+        psFree(options);
+        return NULL;
+    }
+
+    options->maskMode = pmMaskIdentifyModeFromString (maskMode);
+    if (options->maskMode == PM_MASK_ID_NONE) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "invalid mask mode %s.", maskMode);
+        psFree(options);
+        return NULL;
+    }
+
 #if 0
     // Or you can set them individually

trunk/ppMerge/src/ppMergeOptions.h

@@ -37 +37 @@
     float maskSuspect;                  // Threshold for identifying suspect pixels
     float maskBad;                      // Threshold for identifying bad pixels
+    pmMaskIdentifyMode maskMode;        // how to set the limit based on the threshold value above?
     ppOnOff onOff;                      // On/off pairs?
     pmCombineParams *combine;           // Combination parameters