Changeset 10212

Timestamp:

Nov 27, 2006, 6:27:37 PM (19 years ago)

Author:

Paul Price

Message:

Cleaning up.

File:

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

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -6 +6 @@
 #include "ppImageDetrendFringe.h"
 
-bool ppImageDetrendReadout (pmConfig *config, ppImageOptions *options, pmFPAview *view)
+bool ppImageDetrendReadout(pmConfig *config, ppImageOptions *options, pmFPAview *view)
 {
     // construct a view for the detrend images (which have only one readout)
-    pmFPAview *detview = pmFPAviewAlloc (0);
+    pmFPAview *detview = pmFPAviewAlloc(0);
     *detview = *view;
     detview->readout = 0;
 
     // find the currently selected readout
-    pmReadout *input = pmFPAfileThisReadout (config->files, view, "PPIMAGE.INPUT");
-
-    // create the target mask and weight images
-    pmReadoutGenerateMaskWeight (input);
+    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);
-        // ppImageDetrendMask(input, mask);
+        pmReadout *mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
+        pmMaskBadPixels(input, mask, options->maskValue);
     }
 
@@ -37 +33 @@
     pmReadout  *bias = NULL;
     if (options->doBias) {
-        bias = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.BIAS");
+        bias = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.BIAS");
     }
     if (options->doDark) {
-        dark = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.DARK");
+        dark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.DARK");
     }
 
@@ -60 +56 @@
     // Flat-field correction (no options used?)
     if (options->doFlat) {
-        pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
+        pmReadoutGenerateMaskWeight(input);
+        pmReadout *flat = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.FLAT");
         if (!pmFlatField(input, flat)) {
             return false;
@@ -80 +77 @@
     }
 
-    psFree (detview);
+    psFree(detview);
     return true;
 }