Changeset 39377 for trunk/Ohana/src/relphot/src/relphot_objects.c

Timestamp:

Feb 23, 2016, 4:53:15 PM (10 years ago)

Author:

eugene

Message:

clean up names for average object flags; add some additional flags for astrometry

File:

• trunk/Ohana/src/relphot/src/relphot_objects.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -63 +63 @@
       Nsecfilt = catalog.Nsecfilt;
 
-      DVOAverageFlags astromBits = 
-        ID_STAR_FIT_AVE   | 
-        ID_STAR_FIT_PM    | 
-        ID_STAR_FIT_PAR   | 
-        ID_STAR_USE_AVE   | 
-        ID_STAR_USE_PM    | 
-        ID_STAR_USE_PAR   |
-        ID_STAR_NO_ASTROM ; 
+      DVOAverageFlags photomBits = 
+        ID_OBJ_EXT             | // extended in our data (eg, PS)
+        ID_OBJ_EXT_ALT         | // extended in external data (eg, 2MASS)
+        ID_OBJ_GOOD            | // good-quality measurement in our data (eg,PS)
+        ID_OBJ_GOOD_ALT        | // good-quality measurement in  external data (eg, 2MASS)
+        ID_OBJ_GOOD_STACK      | // good-quality object in the stack (> 1 good stack)
+        ID_OBJ_BEST_STACK      | // the primary stack measurement are the best measurements
+        ID_OBJ_SUSPECT_STACK   | // suspect object in the stack (> 1 good or suspect stack, < 2 good)
+        ID_OBJ_BAD_STACK;        // good-quality object in the stack (> 1 good stack)
       
       for (j = 0; j < catalog.Naverage; j++) {
-        catalog.average[j].flags &= astromBits; // reset all except astrometry bits
+        catalog.average[j].flags &= ~photomBits; // reset all except astrometry bits
         catalog.average[j].psfQF     = NAN;     // reset (will be re-calculated here)
         catalog.average[j].psfQFperf = NAN;     // reset (will be re-calculated here)