Index: trunk/Ohana/src/libdvo/include/dvo.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvo.h	(revision 16981)
+++ trunk/Ohana/src/libdvo/include/dvo.h	(revision 17190)
@@ -98,13 +98,25 @@
 
 /* Measure.flags values */
-# define ID_MEAS_NOCAL        0x0001
-# define ID_MEAS_POOR         0x0002
-# define ID_MEAS_SKIP         0x0004
-# define ID_MEAS_AREA         0x0008
-# define BLEND_IMAGE          0x0100 
-# define BLEND_CATALOG        0x0200
-# define BLEND_IMAGE_NEIGHBOR 0x1000
-# define ID_MEAS_TRAIL        0x2000
-# define ID_MEAS_GHOST        0x4000
+// XXX replace the # defines with typedef enum
+# define ID_MEAS_NOCAL        0x0001  /* detection ignored for this analysis (photcode, time range) -- internal only */
+# define ID_MEAS_POOR_PHOTOM  0x0002  /* detection is photometry outlier					     */	  
+# define ID_MEAS_SKIP_PHOTOM  0x0004  /* detection was ignored for photometry measurement			     */	  
+# define ID_MEAS_AREA         0x0008  /* detection near image edge						     */
+# define ID_MEAS_POOR_ASTROM  0x0010  /* detection is astrometry outlier					     */	  
+# define ID_MEAS_SKIP_ASTROM  0x0020  /* detection was ignored for astrometry measurement			     */	  
+# define ID_MEAS_UNDEF_1      0x0040  /* unused									     */
+# define ID_MEAS_UNDEF_2      0x0080  /* unused									     */
+# define ID_MEAS_BLEND_MEAS   0x0100  /* detection is within radius of multiple objects				     */
+# define ID_MEAS_BLEND_OBJ    0x0200  /* multiple detections within radius of object				     */
+# define ID_MEAS_UNDEF_3      0x0400  /* unused									     */
+# define ID_MEAS_UNDEF_4      0x0800  /* unused									     */
+# define ID_MEAS_BLEND_MEAS_X 0x1000  /* detection is within radius of multiple objects across catalogs		     */
+# define ID_MEAS_ARTIFACT     0x2000  /* detection is thought to be non-astronomical				     */
+# define ID_MEAS_UNDEF_5      0x4000  /* unused									     */
+# define ID_MEAS_UNDEF_6      0x8000  /* unused									     */
+
+// XXX we used these names previously in markstar: replace with ID_MEAS_ARTIFACT
+// # define ID_MEAS_TRAIL        0x2000
+// # define ID_MEAS_GHOST        0x4000
 
 /* some subtle distinctions between the blend flags: