Changeset 16844

Timestamp:

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

Author:

Paul Price

Message:

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

Location:

trunk/ppImage/src

Files:

• ppImageArguments.c (modified) (2 diffs)
• ppImageDetrendReadout.c (modified) (3 diffs)
• ppImageParseCamera.c (modified) (2 diffs)

trunk/ppImage/src/ppImageArguments.c

@@ -10 +10 @@
     fprintf(stderr, "\t-stats STATS.mdc: Output statistics into STATS.mdc\n");
     fprintf(stderr, "\t-isfringe: The input image contains fringe data.\n");
+    fprintf(stderr, "\t-isdark: The input image contains dark data.\n");
     fprintf(stderr, "\t-usemask MASKVAL: Use this mask value (override recipe).\n");
     fprintf(stderr, "\t-chip CHIPNUM: Only process this chip number.\n");
@@ -71 +72 @@
                           "Input is fringe image", true);
     }
+    if ((argnum = psArgumentGet(argc, argv, "-isdark"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "INPUT_IS_DARK", PS_META_REPLACE,
+                          "Input is dark image", true);
+    }
 
     // the following options override the PPIMAGE recipe options

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;
+        }
     }
 

trunk/ppImage/src/ppImageParseCamera.c

@@ -59 +59 @@
     }
     if (options->doDark) {
-        if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.DARK", "DARK", PM_FPA_FILE_IMAGE, PM_DETREND_TYPE_DARK)) {
+        if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.DARK", "DARK", PM_FPA_FILE_DARK, PM_DETREND_TYPE_DARK)) {
             psError (PS_ERR_IO, false, "Can't find a dark image source");
             psFree (options);
@@ -393 +393 @@
         outImage->type = PM_FPA_FILE_FRINGE;
     }
+    if (psMetadataLookupBool(NULL, config->arguments, "INPUT_IS_DARK")) {
+        // It's a dark file, so change the file type
+        input->type = PM_FPA_FILE_DARK;
+        outImage->type = PM_FPA_FILE_DARK;
+    }
 
     // Turn off mask and weight output if we're not doing anything interesting