Changeset 13591 for trunk/psModules/src/camera/pmFPAMaskWeight.c

Timestamp:

Jun 1, 2007, 5:51:03 PM (19 years ago)

Author:

Paul Price

Message:

Adding pmConfigMask to use symbolic names for mask values. Need to adapt APIs that use mask values to accept the values for those masks (which can be obtained from pmConfigMask).

File:

• trunk/psModules/src/camera/pmFPAMaskWeight.c (modified) (8 diffs)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -93 +93 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutSetMask(pmReadout *readout)
+bool pmReadoutSetMask(pmReadout *readout, psMaskType satMask, psMaskType badMask)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -131 +131 @@
         for (int j = 0; j < image->numCols; j++) {
             if (imageData[i][j] >= saturation) {
-                maskData[i][j] |= PM_MASK_SAT;
+                maskData[i][j] |= satMask;
             }
             if (imageData[i][j] <= bad) {
-                maskData[i][j] |= PM_MASK_BAD;
+                maskData[i][j] |= badMask;
             }
         }
@@ -145 +145 @@
 // pixels.  currently, it will set mask bits if (value <= BAD) or (value >= SATURATION)
 // should we optionally ignore these tests?
-bool pmReadoutGenerateMask(pmReadout *readout)
+bool pmReadoutGenerateMask(pmReadout *readout, psMaskType satMask, psMaskType badMask)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -188 +188 @@
     }
 
-    return pmReadoutSetMask(readout);
+    return pmReadoutSetMask(readout, satMask, badMask);
 }
 
@@ -282 +282 @@
 }
 
-bool pmReadoutGenerateMaskWeight(pmReadout *readout, bool poisson)
+bool pmReadoutGenerateMaskWeight(pmReadout *readout, psMaskType satMask, psMaskType badMask, bool poisson)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -288 +288 @@
     bool success = true;                // Was everything successful?
 
-    success &= pmReadoutGenerateMask(readout);
+    success &= pmReadoutGenerateMask(readout, satMask, badMask);
     success &= pmReadoutGenerateWeight(readout, poisson);
 
@@ -294 +294 @@
 }
 
-bool pmCellGenerateMaskWeight(pmCell *cell, bool poisson)
+bool pmCellGenerateMaskWeight(pmCell *cell, psMaskType satMask, psMaskType badMask, bool poisson)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -302 +302 @@
     for (int i = 0; i < readouts->n; i++) {
         pmReadout *readout = readouts->data[i]; // The readout
-        pmReadoutGenerateMaskWeight(readout, poisson);
+        pmReadoutGenerateMaskWeight(readout, poisson, satMask, badMask);
     }