Changeset 10322 for trunk/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Nov 30, 2006, 1:25:59 PM (19 years ago)

Author:

Paul Price

Message:

Preventing masking where it's not necessary (e.g., for bias, dark
creation, don't want a mask, since it will mask negative pixels; for
this reason, masking should be done after the bias has been applied
--- though this might affect the saturation: check later).

File:

• trunk/ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -15 +15 @@
     // find the currently selected readout
     pmReadout *input = pmFPAfileThisReadout(config->files, view, "PPIMAGE.INPUT");
-
-    // apply the externally supplied mask to the input->mask pixels
-    if (options->doMask) {
-        pmReadout *mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
-        pmMaskBadPixels(input, mask, options->maskValue);
-    }
 
 # if 0
@@ -46 +40 @@
     }
 
-    // create the target mask and weight images
-    pmReadoutGenerateMaskWeight(input, true);
+    if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
+        // create the target mask and weight images
+        pmReadoutGenerateMaskWeight(input, true);
+    }
+
+    // apply the externally supplied mask to the input->mask pixels
+    if (options->doMask) {
+        pmReadout *mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
+        pmMaskBadPixels(input, mask, options->maskValue);
+    }
 
     // Shutter correction