Index: trunk/psModules/src/camera/pmFPAMaskWeight.h
===================================================================
--- trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 24483)
+++ trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 25116)
@@ -15,24 +15,4 @@
 /// @addtogroup Camera Camera Layout
 /// @{
-
-#if 0
-/// Pixel mask values
-typedef enum {
-    PM_MASK_CLEAR    = 0x00,            ///< The pixel is not masked
-    PM_MASK_BLANK    = 0x01,            ///< The pixel is blank or has no (valid) data
-    PM_MASK_FLAT     = 0x02,            ///< The pixel is non-positive in the flat-field
-    PM_MASK_DETECTOR = 0x02,            ///< The detector pixel is bad (e.g., bad column, charge trap)
-    PM_MASK_SAT      = 0x04,            ///< The pixel is saturated in the image of interest
-    PM_MASK_BAD      = 0x04,            ///< The pixel is low in the image of interest
-    PM_MASK_RANGE    = 0x04,            ///< The pixel is out of range in the image of interest
-    PM_MASK_CR       = 0x08,            ///< The pixel is probably a CR
-    PM_MASK_SPARE1   = 0x10,            ///< Spare mask value
-    PM_MASK_SPARE2   = 0x20,            ///< Spare mask value
-    PM_MASK_SUSPECT  = 0x40,            ///< The pixel is suspected of being bad, but may not be
-    PM_MASK_MARK     = 0x80,            ///< The pixel is marked as temporarily ignored
-} pmMaskValue;
-#define PM_MASK_MARK 0x80            ///< The pixel is marked as temporarily ignored
-#define PM_MASK_SAT  0x04            ///< The pixel is saturated in the image of interest
-#endif
 
 /// Set a temporary readout mask using CELL.SATURATION and CELL.BAD
@@ -54,5 +34,5 @@
 /// can't be generated.
 bool pmReadoutSetVariance(pmReadout *readout, ///< Readout for which to set variance
-			  const psImage *noiseMap, ///< 2D image of the read noise in DN
+                          const psImage *noiseMap, ///< 2D image of the read noise in DN
                           bool poisson    ///< Include poisson variance (in addition to read noise)?
     );
@@ -73,5 +53,5 @@
 /// with HDU entry).  This is intended for most operations.
 bool pmReadoutGenerateVariance(pmReadout *readout, ///< Readout for which to generate variance
-			  const psImage *noiseMap, ///< 2D image of the read noise in DN
+                          const psImage *noiseMap, ///< 2D image of the read noise in DN
                                bool poisson    ///< Include poisson variance (in addition to read noise)?
     );
@@ -83,5 +63,5 @@
                                    psImageMaskType sat, ///< Mask value to give saturated pixels
                                    psImageMaskType bad, ///< Mask value to give bad (low) pixels
-				   const psImage *noiseMap, ///< 2D image of the read noise in DN
+                                   const psImage *noiseMap, ///< 2D image of the read noise in DN
                                    bool poisson ///< Include poisson variance (in addition to read noise)?
     );
@@ -93,5 +73,5 @@
                                 psImageMaskType sat, ///< Mask value to give saturated pixels
                                 psImageMaskType bad, ///< Mask value to give bad (low) pixels
-				const psImage *noiseMap, ///< 2D image of the read noise in DN
+                                const psImage *noiseMap, ///< 2D image of the read noise in DN
                                 bool poisson ///< Include poisson variance (in addition to read noise)?
     );