Changeset 7275 for trunk/psModules/src/camera

Timestamp:

Jun 1, 2006, 12:44:47 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmFPAMaskWeight.h to psmodules.h, small changes to pmReadoutSetMask, removing pmMaskBadPixels from build (mostly achieved by simpler pmReadoutSetMask)

Location:

trunk/psModules/src/camera

Files:

• Makefile.am (modified) (2 diffs)
• pmFPAMaskWeight.c (modified) (2 diffs)

trunk/psModules/src/camera/Makefile.am

@@ -8 +8 @@
         pmFPACopy.c \
         pmFPAHeader.c \
+        pmFPAMaskWeight.c \
         pmFPARead.c \
         pmFPAUtils.c \
@@ -29 +30 @@
         pmFPACopy.h \
         pmFPAHeader.h \
+        pmFPAMaskWeight.h \
         pmFPARead.h \
         pmFPAUtils.h \

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -18 +18 @@
         return false;
     }
-    float bad = psMetadataLookupF32(NULL, cell->concepts, "CELL.BAD"); // Bad level
+    float bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD"); // Bad level
     if (!mdok || isnan(bad)) {
         psError(PS_ERR_IO, true, "CELL.BAD is not set --- unable to set mask.\n");
         return false;
     }
+    psTrace(__func__, 5, "Saturation: %f, bad: %f\n", saturation, bad);
 
     psImage *image = readout->image;    // The image pixels
@@ -35 +36 @@
     for (int i = 0; i < image->numRows; i++) {
         for (int j = 0; j < image->numCols; j++) {
-            if (image->data.F32[i][j] > saturation) {
+            if (image->data.F32[i][j] >= saturation) {
                 mask->data.U8[i][j] |= PM_MASK_SAT;
             }
-            if (image->data.F32[i][j] < bad) {
+            if (image->data.F32[i][j] <= bad) {
                 mask->data.U8[i][j] |= PM_MASK_BAD;
             }