Index: /trunk/psModules/src/camera/Makefile.am
===================================================================
--- /trunk/psModules/src/camera/Makefile.am	(revision 7274)
+++ /trunk/psModules/src/camera/Makefile.am	(revision 7275)
@@ -8,4 +8,5 @@
 	pmFPACopy.c \
 	pmFPAHeader.c \
+	pmFPAMaskWeight.c \
 	pmFPARead.c \
 	pmFPAUtils.c \
@@ -29,4 +30,5 @@
 	pmFPACopy.h \
 	pmFPAHeader.h \
+	pmFPAMaskWeight.h \
 	pmFPARead.h \
 	pmFPAUtils.h \
Index: /trunk/psModules/src/camera/pmFPAMaskWeight.c
===================================================================
--- /trunk/psModules/src/camera/pmFPAMaskWeight.c	(revision 7274)
+++ /trunk/psModules/src/camera/pmFPAMaskWeight.c	(revision 7275)
@@ -18,9 +18,10 @@
         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,8 +36,8 @@
     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;
             }
Index: /trunk/psModules/src/detrend/Makefile.am
===================================================================
--- /trunk/psModules/src/detrend/Makefile.am	(revision 7274)
+++ /trunk/psModules/src/detrend/Makefile.am	(revision 7275)
@@ -7,8 +7,8 @@
 	pmFlatNormalize.c \
 	pmFringeStats.c \
-	pmMaskBadPixels.c \
 	pmNonLinear.c \
-        pmSubtractBias.c
-#        pmSubtractSky.c
+	pmSubtractBias.c
+#	pmSubtractSky.c
+#	pmMaskBadPixels.c
 
 psmoduleincludedir = $(includedir)
@@ -18,11 +18,13 @@
 	pmFlatNormalize.h \
 	pmFringeStats.h \
-	pmMaskBadPixelsErrors.h \
-	pmMaskBadPixels.h \
 	pmNonLinear.h \
-        pmSubtractBias.h
-#        pmSubtractSky.c
+	pmSubtractBias.h
+#	pmSubtractSky.c
+#	pmMaskBadPixelsErrors.h
+#	pmMaskBadPixels.h
 
-EXTRA_DIST = pmFlatFieldErrors.dat pmMaskBadPixelsErrors.dat
+EXTRA_DIST = \
+	pmFlatFieldErrors.dat
+#	pmMaskBadPixelsErrors.dat
 
 CLEANFILES = *~
Index: /trunk/psModules/src/psmodules.h
===================================================================
--- /trunk/psModules/src/psmodules.h	(revision 7274)
+++ /trunk/psModules/src/psmodules.h	(revision 7275)
@@ -38,4 +38,5 @@
 #include <pmFPACopy.h>
 #include <pmFPAHeader.h>
+#include <pmFPAMaskWeight.h>
 #include <pmFPARead.h>
 #include <pmFPAWrite.h>
@@ -53,6 +54,6 @@
 #include <pmFlatNormalize.h>
 #include <pmFringeStats.h>
-#include <pmMaskBadPixels.h>
-#include <pmMaskBadPixelsErrors.h>
+//#include <pmMaskBadPixels.h>
+//#include <pmMaskBadPixelsErrors.h>
 #include <pmNonLinear.h>
 #include <pmSubtractBias.h>