Index: trunk/psModules/src/camera/pmFPAMaskWeight.h
===================================================================
--- trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 20486)
+++ trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 21183)
@@ -5,6 +5,6 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-31 21:50:16 $
+ * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:38 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -42,6 +42,6 @@
 /// iterating using pmReadoutReadNext, in which case the HDU can't be generated.
 bool pmReadoutSetMask(pmReadout *readout, ///< Readout for which to set mask
-                      psMaskType satMask, ///< Mask value to give saturated pixels
-                      psMaskType badMask  ///< Mask value to give bad (low) pixels
+                      psImageMaskType satMask, ///< Mask value to give saturated pixels
+                      psImageMaskType badMask  ///< Mask value to give bad (low) pixels
     );
 
@@ -62,6 +62,6 @@
 /// is suitable for output (complete with HDU entry).  This is intended for most operations.
 bool pmReadoutGenerateMask(pmReadout *readout, ///< Readout for which to generate mask
-                           psMaskType sat, ///< Mask value to give saturated pixels
-                           psMaskType bad ///< Mask value to give bad (low) pixels
+                           psImageMaskType sat, ///< Mask value to give saturated pixels
+                           psImageMaskType bad ///< Mask value to give bad (low) pixels
     );
 
@@ -79,6 +79,6 @@
 /// Calls pmReadoutGenerateMask and pmReadoutGenerateWeight for the readout
 bool pmReadoutGenerateMaskWeight(pmReadout *readout, ///< Readout for which to generate mask and weights
-                                 psMaskType sat, ///< Mask value to give saturated pixels
-                                 psMaskType bad, ///< Mask value to give bad (low) pixels
+                                 psImageMaskType sat, ///< Mask value to give saturated pixels
+                                 psImageMaskType bad, ///< Mask value to give bad (low) pixels
                                  bool poisson ///< Use poisson weights (in addition to read noise)?
                                 );
@@ -88,6 +88,6 @@
 /// Calls pmReadoutGenerateMaskWeight for each readout within the cell.
 bool pmCellGenerateMaskWeight(pmCell *cell, ///< Cell for which to generate mask and weights
-                              psMaskType sat, ///< Mask value to give saturated pixels
-                              psMaskType bad, ///< Mask value to give bad (low) pixels
+                              psImageMaskType sat, ///< Mask value to give saturated pixels
+                              psImageMaskType bad, ///< Mask value to give bad (low) pixels
                               bool poisson ///< Use poisson weights (in addition to read noise)?
                              );
@@ -98,5 +98,5 @@
 bool pmReadoutWeightRenormPixels(
     const pmReadout *readout,           ///< Readout to normalise
-    psMaskType maskVal,                 ///< Value to mask
+    psImageMaskType maskVal,                 ///< Value to mask
     psStatsOptions meanStat,            ///< Statistic to measure the mean (of the variance map)
     psStatsOptions stdevStat,           ///< Statistic to measure the stdev (of the image)
@@ -110,5 +110,5 @@
 bool pmReadoutWeightRenormPhot(
     const pmReadout *readout,           ///< Readout to normalise
-    psMaskType maskVal,                 ///< Value to mask
+    psImageMaskType maskVal,                 ///< Value to mask
     int num,                            ///< Number of instances to measure over the image
     float width,                        ///< Photometry width
@@ -123,5 +123,5 @@
 /// that patch corresponds.
 bool pmReadoutWeightRenorm(const pmReadout *readout, // Readout to normalise
-                           psMaskType maskVal, // Value to mask
+                           psImageMaskType maskVal, // Value to mask
                            psStatsOptions meanStat, // Statistic to measure the mean (of the variance map)
                            psStatsOptions stdevStat, // Statistic to measure the stdev (of the image)
@@ -136,5 +136,5 @@
 /// the provided value.
 bool pmReadoutMaskNonfinite(pmReadout *readout, ///< Readout to mask
-                            psMaskType maskVal ///< Mask value to give non-finite pixels
+                            psImageMaskType maskVal ///< Mask value to give non-finite pixels
     );
 
@@ -145,5 +145,5 @@
 /// sets masked areas to NAN in the image and weight.
 bool pmReadoutMaskApply(pmReadout *readout, ///< Readout to mask
-                        psMaskType maskVal ///< Mask value for which to apply mask
+                        psImageMaskType maskVal ///< Mask value for which to apply mask
     );
 
@@ -152,9 +152,9 @@
 /// Scan the mask image for bad pixels, and interpolate over them using the nominated options
 bool pmReadoutInterpolateBadPixels(pmReadout *readout, ///< Readout to work on
-                                   psMaskType maskVal, ///< Value to mask
+                                   psImageMaskType maskVal, ///< Value to mask
                                    psImageInterpolateMode mode, ///< Interpolation mode
                                    float poorFrac, ///< Maximum bad fraction of kernel for "poor" status
-                                   psMaskType maskPoor, ///< Mask value to give poor pixels
-                                   psMaskType maskBad ///< Mask value to give bad pixels
+                                   psImageMaskType maskPoor, ///< Mask value to give poor pixels
+                                   psImageMaskType maskBad ///< Mask value to give bad pixels
     );