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

Timestamp:

Mar 6, 2008, 10:51:20 AM (18 years ago)

Author:

Paul Price

Message:

Adding support for multi-darks, instead of traditional darks.

File:

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

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -32 +32 @@
 # endif
 
-    // set up the readouts for dark and bias
-    pmReadout  *dark = NULL;
+    // set up the dark and bias
+    pmCell *dark = NULL;
     pmReadout  *bias = NULL;
     if (options->doBias) {
@@ -39 +39 @@
     }
     if (options->doDark) {
-        dark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.DARK");
+        dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.DARK");
     }
 
     // Bias, dark and overscan subtraction are all merged.
-    if (options->doBias || options->doDark || options->doOverscan) {
-        if (!pmBiasSubtract(input, options->overscan, bias, dark, view)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to subtract bias.\n");
+    if (options->doBias || options->doOverscan) {
+        if (!pmBiasSubtract(input, options->overscan, bias, NULL, view)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to subtract bias.");
             return false;
         }
@@ -54 +54 @@
         // create the target mask and weight images
         pmReadoutGenerateWeight(input, true);
+    }
+
+    if (options->doDark) {
+        if (!pmDarkApply(input, dark, options->maskValue)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to subtract dark.");
+            return false;
+        }
     }