Index: trunk/Ohana/src/libdvo/include/dvo.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvo.h	(revision 39359)
+++ trunk/Ohana/src/libdvo/include/dvo.h	(revision 39377)
@@ -172,31 +172,37 @@
 /* Average.flags values -- these values are 32 bit (as of PS1_V1) */
 typedef enum {
-  ID_STAR_FEW          = 0x00000001, // used within relphot: skip star
-  ID_STAR_POOR         = 0x00000002, // used within relphot: skip star
-  ID_ICRF_QSO          = 0x00000004, // object IDed with known ICRF quasar (may have ICRF position measurement)
-  ID_OTHEF_QSO         = 0x00000008, // object IDed with known or suspected quasar, without ICRF reference data
-  ID_PROPER            = 0x00000010, // star with large proper motion
-  ID_TRANSIENT         = 0x00000020, // identified as a non-periodic (stationary) transient
-  ID_VARIABLE          = 0x00000040, // identified as a periodic variable
-  ID_ASTEROID          = 0x00000080, // identified with a known solar-system object (asteroid or other)
-  ID_STACK_ASTROM      = 0x00000100, // stack position used for astrometry
-  
-  // bits 0x00000200 - 0x00008000 are currently unused
-  ID_OBJ_BEST_STACK    = 0x00008000, // the primary stack measurement are the best measurements
-  ID_STAR_FIT_AVE      = 0x00010000, // average position fitted
-  ID_STAR_FIT_PM       = 0x00020000, // proper motion fitted
-  ID_STAR_FIT_PAR      = 0x00040000, // parallax fitted
-  ID_STAR_USE_AVE      = 0x00080000, // average position used (not PM or PAR)
-  ID_STAR_USE_PM       = 0x00100000, // proper motion used (not AVE or PAR)
-  ID_STAR_USE_PAR      = 0x00200000, // parallax used (not AVE or PM)
-  ID_STAR_NO_ASTROM    = 0x00400000, // mean astrometry could not be measured
-  ID_STAR_BAD_PM       = 0x00800000, // mean astrometry could not be measured
-  ID_OBJ_EXT           = 0x01000000, // extended in our data (eg, PS)
-  ID_OBJ_EXT_ALT       = 0x02000000, // extended in external data (eg, 2MASS)
-  ID_OBJ_GOOD          = 0x04000000, // good-quality measurement in our data (eg,PS)
-  ID_OBJ_GOOD_ALT      = 0x08000000, // good-quality measurement in  external data (eg, 2MASS)
-  ID_OBJ_GOOD_STACK    = 0x10000000, // good-quality object in the stack (> 1 good stack)
-  ID_OBJ_SUSPECT_STACK = 0x20000000, // suspect object in the stack (> 1 good or suspect stack, < 2 good)
-  ID_OBJ_BAD_STACK     = 0x40000000, // good-quality object in the stack (> 1 good stack)
+  ID_OBJ_FEW             = 0x00000001, // used within relphot: skip star
+  ID_OBJ_POOR            = 0x00000002, // used within relphot: skip star
+  // NOTE: bits used for object classification:
+  ID_OBJ_ICRF_QSO        = 0x00000004, // object IDed with known ICRF quasar (may have ICRF position measurement)
+  ID_OBJ_OTHEF_QSO       = 0x00000008, // identified as likely QSO (Hernitschek et al 2015), without ICRF reference data
+  ID_OBJ_TRANSIENT       = 0x00000010, // identified as a non-periodic (stationary) transient
+  ID_OBJ_VARIABLE        = 0x00000020, // identified as a periodic variable
+  ID_OBJ_RRLYRA          = 0x00000040, // identified as likely RR Lyra (Hernitschek et al 2015)
+  ID_OBJ_HAS_SOLSYS_DET  = 0x00000080, // identified with a known solar-system object (asteroid or other)
+  ID_OBJ_ALL_SOLSYS_DET  = 0x00000100, // identified with a known solar-system object (asteroid or other)
+  // bits 0x00000200 - 0x00000400 are currently unused
+  // NOTE: bits used for astrometry analysis
+  ID_OBJ_LARGE_PM        = 0x00000800, // star with large proper motion
+  ID_OBJ_RAW_AVE      	 = 0x00001000, // simple weighted average position was used (no IRLS fitting)
+  ID_OBJ_FIT_AVE      	 = 0x00002000, // average position was fitted
+  ID_OBJ_FIT_PM       	 = 0x00004000, // proper motion model was fitted
+  ID_OBJ_FIT_PAR      	 = 0x00008000, // parallax model was fitted
+  ID_OBJ_USE_AVE      	 = 0x00010000, // average position used (not PM or PAR)
+  ID_OBJ_USE_PM       	 = 0x00020000, // proper motion used (not AVE or PAR)
+  ID_OBJ_USE_PAR      	 = 0x00040000, // parallax used (not AVE or PM)
+  ID_OBJ_NO_MEAN_ASTROM  = 0x00080000, // mean astrometry could not be measured
+  ID_OBJ_STACK_FOR_MEAN  = 0x00100000, // stack position used for mean astrometry
+  ID_OBJ_MEAN_FOR_STACK  = 0x00200000, // mean astrometry could not be measured
+  ID_OBJ_BAD_PM          = 0x00400000, // failure to measure proper-motion model
+  // NOTE: bits used for photometry analysis
+  ID_OBJ_EXT             = 0x00800000, // extended in our data (eg, PS)
+  ID_OBJ_EXT_ALT         = 0x01000000, // extended in external data (eg, 2MASS)
+  ID_OBJ_GOOD            = 0x02000000, // good-quality measurement in our data (eg,PS)
+  ID_OBJ_GOOD_ALT        = 0x04000000, // good-quality measurement in  external data (eg, 2MASS)
+  ID_OBJ_GOOD_STACK      = 0x08000000, // good-quality object in the stack (> 1 good stack)
+  ID_OBJ_BEST_STACK      = 0x10000000, // the primary stack measurement are the best measurements
+  ID_OBJ_SUSPECT_STACK   = 0x20000000, // suspect object in the stack (> 1 good or suspect stack, < 2 good)
+  ID_OBJ_BAD_STACK       = 0x40000000, // good-quality object in the stack (> 1 good stack)
 } DVOAverageFlags;