Changeset 35118 for trunk/ppBackground/src/ppBackgroundRestore.c

Timestamp:

Feb 7, 2013, 1:40:20 PM (13 years ago)

Author:

bills

Message:

Changes to the chip backround and warp background stages.
In chip background stage

Apply an auxillary mask selected for now from hard coded location.
Read input variance and include it in the output data products

In warp background stage

Read and write variance images
Get smf from alternate camRun. For now using a hard coded label
eventually from the warpBackgroundRun

File:

• trunk/ppBackground/src/ppBackgroundRestore.c (modified) (2 diffs)

trunk/ppBackground/src/ppBackgroundRestore.c

@@ -35 +35 @@
 
 bool ppBackgroundRestore(pmChip *chip, const pmChip *background, const pmChip *pattern,
-                         const pmFPAview *oldView, pmConfig *config)
+                         const pmFPAview *oldView, pmConfig *config, psImageMaskType maskBad)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
@@ -120 +120 @@
     }
 
+    psImage *auxMask = psMetadataLookupPtr(NULL, ro->analysis, "EXPNUM");
+    if (auxMask) {
+        if (auxMask->numCols != mask->numCols || auxMask->numRows != mask->numRows) {
+            psError(PPBACKGROUND_ERR_DATA, true, "auxiliary mask size (%d x %d) does not match input size (%d x %d)",
+                auxMask->numCols, auxMask->numRows, numCols, numRows);
+            return false;
+        }
+        // Arno's masks are floating point, fix later and zero means bad
+        #define AUXMASK_DATA F32
+        for (int y = 0; y < numRows; y++) {
+            for (int x = 0; x < numCols; x++) {
+                if (auxMask->data.AUXMASK_DATA[y][x] == 0) {
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
+                }
+            }
+        }
+    }
+
+
     ro->data_exists = true;
     ro->parent->data_exists = true;