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

Timestamp:

Oct 10, 2006, 10:59:09 AM (20 years ago)

Author:

Paul Price

Message:

Set CELL.DARKTIME and CELL.EXPOSURE when we've normalised by the dark time. Change options->exptime to options->darktime to properly indicate just what we're normalising by. Normalise by CELL.DARKTIME instead of CELL.EXPOSURE.

File:

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

trunk/ppMerge/src/ppMergeOptions.c

@@ -34 +34 @@
     options->zero = false;
     options->scale = false;
-    options->exptime = false;
+    options->darktime = false;
     options->shutter = false;
     options->sample = 1;
@@ -147 +147 @@
             options->zero = false;
             options->scale = false;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         } else if (strcasecmp(type, "DARK") == 0) {
             options->zero = false;
             options->scale = false;
-            options->exptime = true;
+            options->darktime = true;
             options->shutter = false;
         } else if (strcasecmp(type, "FLAT") == 0) {
             options->zero = false;
             options->scale = true;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         } else if (strcasecmp(type, "FRINGE") == 0) {
             options->zero = true;
             options->scale = true;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         } else if (strcasecmp(type, "SHUTTER") == 0) {
             options->zero = false;
             options->scale = false;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = true;
         } else {
@@ -173 +173 @@
             options->zero = false;
             options->scale = false;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         }
@@ -180 +180 @@
         options->zero = false;
         options->scale = false;
-        options->exptime = false;
+        options->darktime = false;
     }
 
@@ -186 +186 @@
 #if 0
     // Or you can set them individually
-    OPTION_PARSE(options->zero,    config->arguments, "-zero",    Bool);
-    OPTION_PARSE(options->scale,   config->arguments, "-scale",   Bool);
-    OPTION_PARSE(options->exptime, config->arguments, "-exptime", Bool);
+    OPTION_PARSE(options->zero,     config->arguments, "-zero",    Bool);
+    OPTION_PARSE(options->scale,    config->arguments, "-scale",   Bool);
+    OPTION_PARSE(options->darktime, config->arguments, "-exptime", Bool);
 #endif