Changeset 9996 for trunk/ppMerge/src/ppMergeOptions.c

Timestamp:

Nov 14, 2006, 4:49:37 PM (19 years ago)

Author:

Paul Price

Message:

Reorganising shutter stuff to make it fit within the general framework in ppMergeCombine. Adding ppMergeMask to create a bad pixel mask.

File:

• trunk/ppMerge/src/ppMergeOptions.c (modified) (10 diffs)

trunk/ppMerge/src/ppMergeOptions.c

@@ -37 +37 @@
     options->fringe = false;
     options->shutter = false;
+    options->mask = false;
     options->sample = 1;
     options->mean = PS_STAT_SAMPLE_MEDIAN;
@@ -47 +48 @@
     options->shutterIter = 2;
     options->shutterRej = 3.0;
+    options->maskSuspect = 5.0;
+    options->maskBad = 10.0;
     options->onOff = 0;
     options->combine = pmCombineParamsAlloc(PS_STAT_SAMPLE_MEAN);
@@ -143 +146 @@
     OPTION_PARSE(options->shutterIter,       recipe, "SHUTTER.ITER",   S32);
     OPTION_PARSE(options->shutterRej,        recipe, "SHUTTER.REJECT", F32);
+    OPTION_PARSE(options->maskSuspect,       recipe, "MASK.SUSPECT",   F32);
+    OPTION_PARSE(options->maskBad,           recipe, "MASK.BAD",       F32);
 
     options->combine->combine = parseStat(recipe, "COMBINE");
@@ -159 +164 @@
             options->fringe = false;
             options->shutter = false;
+            options->mask = false;
         } else if (strcasecmp(type, "DARK") == 0) {
             options->zero = false;
@@ -165 +171 @@
             options->fringe = false;
             options->shutter = false;
+            options->mask = false;
         } else if (strcasecmp(type, "FLAT") == 0) {
             options->zero = false;
@@ -171 +178 @@
             options->fringe = false;
             options->shutter = false;
+            options->mask = false;
         } else if (strcasecmp(type, "FRINGE") == 0) {
             options->zero = true;
@@ -177 +185 @@
             options->fringe = true;
             options->shutter = false;
+            options->mask = false;
         } else if (strcasecmp(type, "SHUTTER") == 0) {
             options->zero = false;
@@ -183 +192 @@
             options->fringe = false;
             options->shutter = true;
+            options->mask = false;
+            options->rows = 0;          // Read the whole image at once
+        } else if (strcasecmp(type, "MASK") == 0) {
+            options->zero = false;
+            options->scale = false;
+            options->darktime = false;
+            options->fringe = false;
+            options->shutter = false;
+            options->mask = true;
         } else {
             psLogMsg(__func__, PS_LOG_WARN, "Unrecognised image type: %s --- assuming BIAS.\n", type);
@@ -190 +208 @@
             options->fringe = false;
             options->shutter = false;
+            options->mask = false;
         }
     } else {
@@ -198 +217 @@
         options->fringe = false;
         options->shutter = false;
+        options->mask = false;
     }