Index: trunk/ippconfig/recipes/masks.16bit.config
===================================================================
--- trunk/ippconfig/recipes/masks.16bit.config	(revision 23496)
+++ trunk/ippconfig/recipes/masks.16bit.config	(revision 23498)
@@ -8,24 +8,26 @@
 
 # Mask values which represent features of the detector
-DETECTOR	U8	0x0001		# Something is wrong with the detector
-FLAT		U8	0x0002		# Pixel doesn't flat-field properly
-DARK		U8	0x0004		# Pixel doesn't dark-subtract properly
-BLANK		U8	0x0008		# Pixel doesn't contain valid data
-CTE		U8	0x0010		# Pixel has poor cte
+DETECTOR	U16	0x0001		# Something is wrong with the detector
+FLAT		U16	0x0002		# Pixel doesn't flat-field properly
+DARK		U16	0x0004		# Pixel doesn't dark-subtract properly
+BLANK		U16	0x0008		# Pixel doesn't contain valid data
+CTE		U16	0x0010		# Pixel has poor Charge Transfer Efficiency
 
 # Mask values which represent invalid signal ranges
-RANGE		U8	0x0020		# Pixel is out-of-range of linearity
-SAT		U8	0x0040		# Pixel is saturated
-BAD		U8	0x0080		# Pixel is low (can we rename this 'LOW'?)
+SAT		U16	0x0020		# Pixel is saturated or non-linear
+LOW		U16	0x0040		# Pixel is low
+SUSPECT		U16	0x0080		# Pixel is suspected of being bad
 
 # Mask values which represent non-astronomical structures
-CR		U8	0x0100		# Pixel contains a cosmic ray
-SPIKE		U8	0x0200		# Pixel contains a diffraction spike
-GHOST		U8	0x0400		# Pixel contains an optical ghost
-STREAK		U8	0x0800		# Pixel contains a streak
-STARCORE	U8	0x1000		# Pixel contains a streak
+CR		U16	0x0100		# Pixel contains a cosmic ray
+SPIKE		U16	0x0200		# Pixel contains a diffraction spike
+GHOST		U16	0x0400		# Pixel contains an optical ghost
+STREAK		U16	0x0800		# Pixel contains a streak
+STARCORE	U16	0x1000		# Pixel contains a bright star core
 
 # Mask values which identify pixels badly affected by convolutions and interpolations
-BAD.WARP	U8	0x2000		# Pixel is bad after convolution with a bad pixel
-POOR.WARP	U8	0x4000		# Pixel is poor after convolution with a bad pixel
+CONV.BAD	U16	0x2000		# Pixel is bad after convolution with a bad pixel
+CONV.POOR	U16	0x4000		# Pixel is poor after convolution with a bad pixel
 
+# Spare value for temporary marking
+# MARK		U16	0x8000		# Pixel is temporarily marked
Index: trunk/ippconfig/recipes/ppStack.config
===================================================================
--- trunk/ippconfig/recipes/ppStack.config	(revision 23496)
+++ trunk/ippconfig/recipes/ppStack.config	(revision 23498)
@@ -5,7 +5,7 @@
 COMBINE.SYS	F32	0.08		# Relative systematic error in combination
 COMBINE.DISCARD	F32	0.2		# Discard fraction for Olympic weighted mean
-MASK.VAL	STR	MASK.VALUE,BAD.WARP	# Mask value of input bad pixels
+MASK.VAL	STR	MASK.VALUE,CONV.BAD	# Mask value of input bad pixels
 MASK.BAD	STR	BLANK		# Mask value to give bad pixels
-MASK.POOR	STR	POOR.WARP	# Mask value to give poor pixels
+MASK.POOR	STR	CONV.POOR	# Mask value to give poor pixels
 POOR.FRACTION	F32	0.01		# Maximum fraction of bad variance for poor pixels
 THRESHOLD.MASK	F32	0.5		# Threshold for mask deconvolution (0..1)
Index: trunk/ippconfig/recipes/ppSub.config
===================================================================
--- trunk/ippconfig/recipes/ppSub.config	(revision 23496)
+++ trunk/ippconfig/recipes/ppSub.config	(revision 23498)
@@ -15,7 +15,7 @@
 
 # EAM : we now ignore these: BAD.WARP is always bad, POOR.WARP is always defined
-MASK.IN		STR	MASK.VALUE,BAD.WARP	# Mask value for input
-MASK.BAD        STR	BLANK		# Mask value to give bad pixels
-MASK.POOR       STR	POOR.WARP	# Mask value to give poor pixels
+MASK.IN		STR	MASK.VALUE,CONV.BAD	# Mask value for input
+MASK.BAD        STR	CONV.BAD	# Mask value to give bad pixels
+MASK.POOR       STR	CONV.POOR	# Mask value to give poor pixels
 
 POOR.FRACTION	F32	0.10		# Maximum fraction of bad weight for poor pixels