Changeset 16950

Timestamp:

Mar 12, 2008, 10:51:58 AM (18 years ago)

Author:

Paul Price

Message:

Adding the use of an optional dark normalisation concept. This will usually be CELL.DARKTIME if the user wants to fit the dark current with no ordinates specified (old style of doing darks). Otherwise it will be NONE for a full multi-dimensional polynomial fit, which presumably would include CELL.DARKTIME as one of the ordinates.

Location:

trunk/ppMerge/src

Files:

• ppMergeCombine.c (modified) (1 diff)
• ppMergeOptions.c (modified) (3 diffs)
• ppMergeOptions.h (modified) (1 diff)

trunk/ppMerge/src/ppMergeCombine.c

@@ -227 +227 @@
                                                     options->combine->maskVal);
                     } else if (options->dark) {
-                        pmDarkCombine(cell, stack, options->darkOrdinates, options->combine->iter,
-                                      options->combine->rej, options->combine->maskVal);
+                        pmDarkCombine(cell, stack, options->darkOrdinates, options->darkNorm,
+                                      options->combine->iter, options->combine->rej,
+                                      options->combine->maskVal);
                     } else {
                         pmReadoutCombine(readout, stack, cellZeros, cellScales, options->combine);

trunk/ppMerge/src/ppMergeOptions.c

@@ -23 +23 @@
     psFree(options->format);
     psFree(options->combine);
+    psFree(options->darkOrdinates);
+    psFree(options->darkNorm);
 }
 
@@ -68 +70 @@
     options->growPixels = 0;
     options->darkOrdinates = NULL;
+    options->darkNorm = NULL;
     return options;
 }
@@ -309 +312 @@
         }
         psFree(iter);
+
+        psString darkNorm = psMetadataLookupStr(NULL, recipe, "DARK.NORM"); // Normalisation concept
+        if (darkNorm && strcmp(darkNorm, "NONE") != 0) {
+            options->darkNorm = psStringCopy(darkNorm);
+        }
     }
 

trunk/ppMerge/src/ppMergeOptions.h

@@ -45 +45 @@
     int growPixels;
     psArray *darkOrdinates;             // Ordinates for dark combination
+    psString darkNorm;                  // Dark normalisation concept
 } ppMergeOptions;