Index: /trunk/ippconfig/recipes/masks.config
===================================================================
--- /trunk/ippconfig/recipes/masks.config	(revision 19439)
+++ /trunk/ippconfig/recipes/masks.config	(revision 19440)
@@ -1,32 +1,48 @@
 ### Recipe specifying values for various mask concepts
 
-# this file defines bit values for various abstract mask concepts.  It
-# is not necessary for all bit values to be unique.  Note that there
-# are two main classes: detector-intrinsic and detector-extrinsic
-# effects.  The former will default to DETECTOR and the latter to
-# RANGE if those values are not specifed
+# This file defines bit values for various abstract mask concepts.  It
+# is not necessary for all bit values to be unique.
 
 # Note that it is necessary to leave at least a single unassigned bit
 # for internal marking (or ppImage will complain)
 
-# these mask values are used for detector intrinsic effects
-# BLANK and FLAT will be set to DETECTOR if not specified
-DETECTOR	U8	0x01		# Generic detector-intrinsic defect
-BLANK		U8	0x01		# The pixel is blank or has no (valid) data
-DARK		U8	0x02		# The pixel is not correctable for dark current
-FLAT		U8	0x02		# The pixel is non-positive in the flat-field
 
-# these mask values are used for detector extrinsic effects
-# SAT and BAD will be set to RANGE if not specified
-RANGE		U8	0x04		# The pixel is out of range in the image of interest
-SAT		U8	0x04		# The pixel is saturated in the image of interest
-BAD		U8	0x08		# The pixel is low in the image of interest
+# The following values are TEMPORARY, to be used only until we can get
+# the masking situation sorted out (PAP, 2008-09-09)
+# The following values are constrained by the fact that the GPC1 mask values are set:
+DETECTOR	U8	0x02		# Something is wrong with the detector =2
+FLAT		U8	0x04		# Pixel doesn't flat-field properly =4
+DARK		U8	0x40		# Pixel doesn't dark-subtract properly =64
+# Filling in the rest with whatever makes some sense
+BLANK		U8	0x01		# Pixel doesn't contain valid data
+RANGE		U8	0x01		# Pixel is out-of-range of linearity
+SAT		U8	0x01		# Pixel is saturated
+BAD		U8	0x01		# Pixel is low
+POOR.WARP	U8	0x08		# Pixel is poor after convolution with a bad pixel
+BAD.WARP	U8	0x10		# Pixel is bad after convolution with a bad pixel
+CR		U8	0x20		# Pixel contains a cosmic ray
+GHOST		U8	0x20		# Pixel contains an optical ghost
 
-GHOST		U8	0x08		# The pixel is probably part of a ghost
-CR		U8	0x10		# The pixel is probably a CR
 
-BAD.WARP	U8	0x20		# The pixel is low in the image of interest
-POOR.WARP	U8	0x40		# The pixel is low in the image of interest
-
-# 9 total distinct concepts in here
-# we need one bit for MARK
+###### The following values are what I'm aiming to have in the long term (PAP, 2008-09-09)
+###
+#### Detector-intrinsic; these will default to DETECTOR
+###DETECTOR	U8	0x01		# Something is wrong with the detector
+###DARK		U8	0x02		# Pixel doesn't dark-subtract properly
+###FLAT		U8	0x01		# Pixel doesn't flat-field properly
+###BLANK	U8	0x01		# Pixel doesn't contain valid data
+###
+#### Detector-extrinsic; these will default to RANGE
+###RANGE	U8	0x04		# Pixel is out-of-range of linearity
+###SAT		U8	0x04		# Pixel is saturated
+###LOW		U8	0x04		# Pixel is low
+###
+#### Convolution: pixels that touched a bad pixel
+###POOR		U8	0x08		# Pixel is poor after convolution with a bad pixel
+###CONV		U8	0x10		# Pixel is bad after convolution with a bad pixel
+###
+#### Objects: real signal that should be ignored
+###CR		U8	0x20		# Pixel contains a cosmic ray
+###GHOST	U8	0x40		# Pixel contains an optical ghost
+###
+####MARK		U8	0x80		# RESERVED for MARK