Changeset 16870

Timestamp:

Mar 7, 2008, 9:31:00 AM (18 years ago)

Author:

Paul Price

Message:

Allowing use of old-style darks if OLDDARK(BOOL) is TRUE in the recipe.

Location:

trunk/ppImage/src

Files:

• ppImageDetrendReadout.c (modified) (3 diffs)
• ppImageParseCamera.c (modified) (1 diff)

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -33 +33 @@
 
     // set up the dark and bias
-    pmCell *dark = NULL;
+    pmCell *dark = NULL;                // Multi-dark
+    pmReadout *oldDark = NULL;          // Old-fashioned dark
     pmReadout  *bias = NULL;
     if (options->doBias) {
@@ -39 +40 @@
     }
     if (options->doDark) {
-        dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.DARK");
+        bool mdok;                      // Status of MD lookup
+        psMetadata *recipe = psMetadataLookupPtr (&mdok, config->recipes, RECIPE_NAME);
+        assert(mdok && recipe);
+        if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
+            oldDark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.DARK");
+        } else {
+            dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.DARK");
+        }
     }
 
     // Bias, dark and overscan subtraction are all merged.
     if (options->doBias || options->doOverscan) {
-        if (!pmBiasSubtract(input, options->overscan, bias, NULL, view)) {
+        if (!pmBiasSubtract(input, options->overscan, bias, oldDark, view)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to subtract bias.");
             return false;
@@ -56 +64 @@
     }
 
-    if (options->doDark) {
+    if (options->doDark && dark) {
         if (!pmDarkApply(input, dark, options->maskValue)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to subtract dark.");

trunk/ppImage/src/ppImageParseCamera.c

@@ -431 +431 @@
     }
 
+    // Change the input dark type between the old (IMAGE) and new (multi-DARK).
+    // Hopefully this is a temporary change until we all move over to using the new dark types
+    bool mdok;                          // Status of MD lookup
+    if (options->doDark && psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
+        pmFPAfile *dark = psMetadataLookupPtr(NULL, config->files, "PPIMAGE.DARK");
+        assert(dark);
+        dark->type = PM_FPA_FILE_IMAGE;
+    }
+
     return (options);
 }