Changeset 14356 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Jul 20, 2007, 3:29:23 PM (19 years ago)

Author:

Paul Price

Message:

Mask bad pixels in the combined image.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (4 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -286 +286 @@
                         data->stats = psMetadataAlloc();
                     }
-                    if (!ppStatsFPA(data->stats, data->out, view, options->combine->maskVal, config)) {
+                    if (!ppStatsFPA(data->stats, data->out, view,
+                                    options->combine->maskVal | pmConfigMask("BLANK", config),
+                                    config)) {
                         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
                         return false;
@@ -304 +306 @@
             for (int i = 0; i < filenames->n; i++) {
                 pmFPA *fpaIn = data->in->data[i]; // Input FPA
-                if (!fpaIn) { continue; } // was not a valid input file
+                if (!fpaIn) { continue; } // was not a valid input file
                 pmChip *chipIn = fpaIn->chips->data[view->chip]; // Input chip
                 pmCell *cellIn = chipIn->cells->data[view->cell]; // Input cell
@@ -325 +327 @@
         for (int i = 0; i < filenames->n; i++) {
             pmFPA *fpaIn = data->in->data[i]; // Input FPA
-            if (!fpaIn) { continue; } // was not a valid input file
+            if (!fpaIn) { continue; } // was not a valid input file
             pmChip *chipIn = fpaIn->chips->data[view->chip]; // Input chip
             pmChipFreeData(chipIn);
@@ -345 +347 @@
     for (int i = 0; i < filenames->n; i++) {
         pmFPA *fpaIn = data->in->data[i]; // Input FPA
-        if (!fpaIn) { continue; } // was not a valid input file
+        if (!fpaIn) { continue; } // was not a valid input file
         pmFPAFreeData(fpaIn);
     }