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

Timestamp:

Mar 6, 2008, 10:49:03 AM (18 years ago)

Author:

Paul Price

Message:

Changing to produce multi-darks instead of boring old darks. This allows us to fit the dark current as a function of temperature, time since PON, etc. In fact, what's fit is very configurable.

File:

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

trunk/ppMerge/src/ppMergeOptions.c

@@ -10 +10 @@
 #include "ppMerge.h"
 #include "ppMergeOptions.h"
+
+#define ARRAY_BUFFER 4                  // Number of values to add at once
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -34 +36 @@
     options->zero = false;
     options->scale = false;
-    options->darktime = false;
+    options->dark = false;
     options->fringe = false;
     options->shutter = false;
@@ -65 +67 @@
     options->badMask = 0x00;
     options->growPixels = 0;
+    options->darkOrdinates = NULL;
     return options;
 }
@@ -174 +177 @@
             options->zero = false;
             options->scale = false;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = false;
             options->shutter = false;
@@ -181 +184 @@
             options->zero = false;
             options->scale = false;
-            options->darktime = true;
+            options->dark = true;
             options->fringe = false;
             options->shutter = false;
@@ -188 +191 @@
             options->zero = false;
             options->scale = true;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = false;
             options->shutter = false;
@@ -195 +198 @@
             options->zero = false;
             options->scale = true;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = false;
             options->shutter = false;
@@ -202 +205 @@
             options->zero = false;
             options->scale = true;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = false;
             options->shutter = false;
@@ -209 +212 @@
             options->zero = true;
             options->scale = true;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = true;
             options->shutter = false;
@@ -216 +219 @@
             options->zero = false;
             options->scale = false;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = false;
             options->shutter = true;
@@ -225 +228 @@
             options->zero = false;
             options->scale = false;
-            options->darktime = false;
+            options->dark = false;
             options->fringe = false;
             options->shutter = false;
@@ -255 +258 @@
 
 #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->darktime, config->arguments, "-exptime", Bool);
-#endif
-
     // Number of on/off images
     OPTION_PARSE(options->onOff, config->arguments, "-onoff", S32);
+#endif
 
     // Masking options
@@ -268 +266 @@
     options->badMask = pmConfigMask("BAD", config);
 
+    if (options->dark) {
+        psMetadata *ordinates = psMetadataLookupMetadata(NULL, recipe, "DARK.ORDINATES"); // Ordinates info
+        options->darkOrdinates = psArrayAllocEmpty(psListLength(ordinates->list));
+
+        psMetadataIterator *iter = psMetadataIteratorAlloc(ordinates, PS_LIST_HEAD, NULL); // Iterator
+        psMetadataItem *item;           // Item from iteration
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            int order = 0;              // Polynomial order
+            bool scale = false;         // Scale values?
+            float min = NAN, max = NAN; // Minimum and maximum values for scaling
+            switch (item->type) {
+              case PS_TYPE_S32:
+                order = item->data.S32;
+                break;
+              case PS_DATA_METADATA:
+                order = psMetadataLookupS32(NULL, item->data.md, "ORDER");
+                bool mdok;                  // Status of MD lookup
+                scale = psMetadataLookupBool(&mdok, item->data.md, "SCALE");
+                min = psMetadataLookupF32(&mdok, item->data.md, "MIN");
+                max = psMetadataLookupF32(&mdok, item->data.md, "MAX");
+                break;
+              default:
+                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                        "Type of DARK.ORDINATES entry %s (%x) is not METADATA or S32",
+                        item->name, item->type);
+                psFree(options);
+                return false;
+            }
+            if (order <= 0) {
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "ORDER not positive (%d) for DARK.ORDINATES %s",
+                        order, item->name);
+                psFree(options);
+                return false;
+            }
+
+            pmDarkOrdinate *ord = pmDarkOrdinateAlloc(item->name, order);
+            ord->scale = scale;
+            ord->min = min;
+            ord->max = max;
+            psArrayAdd(options->darkOrdinates, options->darkOrdinates->n, ord);
+            psFree(ord);
+        }
+        psFree(iter);
+    }
+
     return options;
 }