Changeset 28282

Timestamp:

Jun 10, 2010, 7:28:08 AM (16 years ago)

Author:

Paul Price

Message:

Add masking.

Location:

trunk/ppBackground/src

Files:

• ppBackgroundCamera.c (modified) (1 diff)
• ppBackgroundRestore.c (modified) (2 diffs)

trunk/ppBackground/src/ppBackgroundCamera.c

@@ -68 +68 @@
     output->save = true;
 
+    pmFPAfile *outMask = pmFPAfileDefineOutput(data->config, output->fpa, "PPBACKGROUND.OUTPUT.MASK");
+    if (!outMask) {
+        psError(psErrorCodeLast(), false, "Unable to define output.");
+        return false;
+    }
+    outMask->save = true;
+
 #if 0
     // Now the camera has been determined, we can read the recipe

trunk/ppBackground/src/ppBackgroundRestore.c

@@ -22 +22 @@
         return false;
     }
-    psImage *image = ro->image;                             // Image to correct
+    psImage *image = ro->image, *mask = ro->mask;           // Image to correct
     int numCols = image->numCols, numRows = image->numRows; // Size of image
 
@@ -58 +58 @@
         pmReadout *patternRO = pmFPAviewThisReadout(view, pattern->parent); // Readout with pattern
         psImage *patternImage = patternRO->image; // Image with pattern
+        psImage *patternMask = patternRO->mask;   // Mask for pattern
         for (int y = 0; y < numRows; y++) {
             for (int x = 0; x < numCols; x++) {
                 image->data.F32[y][x] += patternImage->data.F32[y][x];
+                mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= patternMask->data.PS_TYPE_IMAGE_MASK_DATA[y][x];
             }
         }