Changeset 34429 for trunk/Ohana/src/libdvo/include/dvo.h

Timestamp:

Sep 11, 2012, 10:26:52 AM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20120905 (fixes some mean values and flags in DVO)

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/libdvo/include/dvo.h (modified) (2 diffs)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -149 +149 @@
 /* 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_PROPER       = 0x00000400, // star with large proper motion
-  ID_TRANSIENT    = 0x00001000, // is this mutually exclusive with USNO?
-  ID_VARIABLE     = 0x00002000, // not currently set?
-  ID_ASTEROID     = 0x00002000, // identified with an asteroid
-  ID_BAD_OBJECT   = 0x00004000, // if all measurements are bad, set this bit
-  ID_MOVING       = 0x00008000, // is a moving object
-  ID_ROCK         = 0x0000a000, // 0x8000 + 0x2000
-  ID_GHOST        = 0x0000c001, // 0x8000 + 0x4000 + 0x0001
-  ID_TRAIL        = 0x0000c002, // 0x8000 + 0x4000 + 0x0002
-  ID_BLEED        = 0x0000c003, // 0x8000 + 0x4000 + 0x0003
-  ID_COSMIC       = 0x0000c004, // 0x8000 + 0x4000 + 0x0004
-  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_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_STAR_FEW       = 0x00000001, // used within relphot: skip star
+  ID_STAR_POOR      = 0x00000002, // used within relphot: skip star
+  ID_PROPER         = 0x00000400, // star with large proper motion
+  ID_TRANSIENT      = 0x00001000, // is this mutually exclusive with USNO?
+  ID_VARIABLE       = 0x00002000, // not currently set?
+  ID_ASTEROID       = 0x00002000, // identified with an asteroid
+  ID_BAD_OBJECT     = 0x00004000, // if all measurements are bad, set this bit
+  ID_MOVING         = 0x00008000, // is a moving object
+  ID_ROCK           = 0x0000a000, // 0x8000 + 0x2000
+  ID_GHOST          = 0x0000c001, // 0x8000 + 0x4000 + 0x0001
+  ID_TRAIL          = 0x0000c002, // 0x8000 + 0x4000 + 0x0002
+  ID_BLEED          = 0x0000c003, // 0x8000 + 0x4000 + 0x0003
+  ID_COSMIC         = 0x0000c004, // 0x8000 + 0x4000 + 0x0004
+  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_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)
 } DVOAverageFlags;
 
@@ -180 +181 @@
   ID_SECF_USE_SYNTH   = 0x00000004, // synthetic photometry used in average measurement
   ID_SECF_USE_UBERCAL = 0x00000008, // synthetic photometry used in average measurement
+  ID_SECF_HAS_PS1     = 0x00000010, // PS1 photometry used in average measurement
+  ID_SECF_HAS_STACK   = 0x00000020, // PS1 stack photometry exists
   ID_PHOTOM_PASS_0    = 0x00000100, // average magnitude calculated in 0th pass
   ID_PHOTOM_PASS_1    = 0x00000200, // average magnitude calculated in 1th pass