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

Timestamp:

May 21, 2007, 6:23:24 PM (19 years ago)

Author:

Paul Price

Message:

Fix order of creation of mask and weight.

File:

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

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -15 +15 @@
     // find the currently selected readout
     pmReadout *input = pmFPAfileThisReadout(config->files, view, "PPIMAGE.INPUT");
+
+    // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
+    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);
+    }
 
 # if 0
@@ -41 +52 @@
     }
 
-    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
     if (options->doShutter) {
@@ -62 +62 @@
     // Flat-field correction (no options used?)
     if (options->doFlat) {
-        pmReadoutGenerateMaskWeight(input, true);
         pmReadout *flat = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.FLAT");
         if (!pmFlatField(input, flat)) {