Changeset 10270

Timestamp:

Nov 28, 2006, 5:06:41 PM (19 years ago)

Author:

Paul Price

Message:

Adding weights option.

Location:

trunk/ppMerge/src

Files:

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

trunk/ppMerge/src/ppMergeCombine.c

@@ -151 +151 @@
                     // Only reading and writing the first readout in each cell (plane 0)
                     if (pmReadoutReadNext(stack->data[i], fits, 0, options->rows)) {
-                        // For anything except BIAS and DARK, we want a mask
-                        if (options->scale || options->zero || options->shutter) {
+                        // If the mask value is set, we want to generate a mask
+                        if (options->combine->maskVal) {
                             pmReadoutSetMask(stack->data[i]);
                         }
-                        if (options->shutter) {
-                            pmReadoutSetWeight(stack->data[i]);
+
+                        // If we're combining with weights, we want to generate weights.
+                        if (options->combine->weights) {
+
+                            // If it's a bias or dark, set the gain to zero: noise only contributed by read
+                            if ((!options->zero && !options->scale) || options->darktime) {
+                                pmReadoutSetWeight(stack->data[i], false);
+                            } else {
+                                pmReadoutSetWeight(stack->data[i], true);
+                            }
                         }
 

trunk/ppMerge/src/ppMergeOptions.c

@@ -58 +58 @@
     options->combine->nKeep = 1;
     options->combine->maskVal = 0xff;
+    options->combine->weights = false;
 
     return options;
@@ -67 +68 @@
 
 // Parse a recipe option according to its type
-#define OPTION_PARSE(OPTION,MD,NAME,TYPE)                                                                    \
-{                                                                                                            \
-    psMetadataItem *item = psMetadataLookup(MD, NAME);                                                       \
-    if (item) {                                                                                              \
-        OPTION = psMetadataItemParse##TYPE(item);                                                            \
-    }                                                                                                        \
+#define OPTION_PARSE(OPTION,MD,NAME,TYPE) \
+{ \
+    psMetadataItem *item = psMetadataLookup(MD, NAME); \
+    if (item) { \
+        OPTION = psMetadataItemParse##TYPE(item); \
+    } else { \
+        psWarning("Recipe option %s isn't specified; using default.\n", NAME); \
+    } \
 }
 
@@ -139 +142 @@
     OPTION_PARSE(options->combine->nKeep,    recipe, "NKEEP",          S32);
     OPTION_PARSE(options->combine->maskVal,  recipe, "MASKVAL",        S32);
+    OPTION_PARSE(options->combine->weights,  recipe, "WEIGHTS",        Bool);
     OPTION_PARSE(options->fringeNum,         recipe, "FRINGE.NUM",     S32);
     OPTION_PARSE(options->fringeSize,        recipe, "FRINGE.SIZE",    S32);