Index: trunk/psModules/src/config/pmConfigMask.c
===================================================================
--- trunk/psModules/src/config/pmConfigMask.c	(revision 23476)
+++ trunk/psModules/src/config/pmConfigMask.c	(revision 23498)
@@ -10,21 +10,23 @@
 
 static pmConfigMaskInfo masks[] = {
-    { "DETECTOR",  NULL,       0x00, true  },   // Something is wrong with the detector
-    { "FLAT",      "DETECTOR", 0x01, true  },   // Pixel doesn't flat-field properly
-    { "DARK",      "DETECTOR", 0x01, true  },   // Pixel doesn't dark-subtract properly
-    { "BLANK",     "DETECTOR", 0x01, true  },   // Pixel doesn't contain valid data
-    { "CTE",       "DETECTOR", 0x01, true  },   // Pixel has poor CTE
-    { "RANGE",     NULL,       0x00, true  },   // Pixel is out-of-range of linearity
-    { "SAT",       "RANGE",    0x01, true  },   // Pixel is saturated
-    { "BAD",       "RANGE",    0x01, true  },   // Pixel is low
-    { "CR",        NULL,       0x01, true  },   // Pixel contains a cosmic ray
-    { "SPIKE",     NULL,       0x01, true  },   // Pixel contains a diffraction spike
-    { "GHOST",     NULL,       0x01, true  },   // Pixel contains an optical ghost
-    { "STREAK",    NULL,       0x01, true  },   // Pixel contains streak data
-    { "STARCORE",  NULL,       0x01, true  },   // Pixel contains a bright star core
-    { "BAD.WARP",  NULL,       0x01, true  },   // Pixel is bad after convolution with a bad pixel
-    { "POOR.WARP", NULL,       0x02, false },   // Pixel is poor after convolution with a bad pixel
-    // "LOW"  Pixel is low
-    // "CONV" Pixel is bad after convolution with a bad pixel
+    // Features of the detector
+    { "DETECTOR",  NULL,       0x01, true  }, // Something is wrong with the detector
+    { "FLAT",      "DETECTOR", 0x01, true  }, // Pixel doesn't flat-field properly
+    { "DARK",      "DETECTOR", 0x01, true  }, // Pixel doesn't dark-subtract properly
+    { "BLANK",     "DETECTOR", 0x01, true  }, // Pixel doesn't contain valid data
+    { "CTE",       "DETECTOR", 0x01, true  }, // Pixel has poor CTE
+    // Invalid signal ranges
+    { "SAT",       NULL,       0x02, true  }, // Pixel is saturated or non-linear
+    { "LOW",       "SAT",      0x02, true  }, // Pixel is low
+    { "SUSPECT",   NULL,       0x04, false }, // Pixel is suspected of being bad
+    // Non-astronomical structures
+    { "CR",        NULL,       0x08, true  }, // Pixel contains a cosmic ray
+    { "SPIKE",     NULL,       0x08, true  }, // Pixel contains a diffraction spike
+    { "GHOST",     NULL,       0x08, true  }, // Pixel contains an optical ghost
+    { "STREAK",    NULL,       0x08, true  }, // Pixel contains streak data
+    { "STARCORE",  NULL,       0x08, true  }, // Pixel contains a bright star core
+    // Effects of convolution and interpolation
+    { "CONV.BAD",  NULL,       0x02, true  }, // Pixel is bad after convolution with a bad pixel
+    { "CONV.POOR", NULL,       0x04, false }, // Pixel is poor after convolution with a bad pixel
 };