Changeset 24557 for branches/eam_branches/20090522/Ohana/src/libdvo/include/dvo.h

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

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

branches/eam_branches/20090522/Ohana/src/libdvo/include/dvo.h

@@ -108 +108 @@
 # 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_USED_OBJ     0x0040  /* detection was used during opdate objects                                    */
+# define ID_MEAS_USED_CHIP    0x0080  /* detection was used during update chips                                      */
 # 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                                 */
@@ -184 +184 @@
   SkyRegion **regions;
 } SkyList;
+
+// special-case function:
+CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, int *Ndata, int *swapped);
 
 # if (0)