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

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

File:

• trunk/Ohana/src/libdvo/include/dvo.h (modified) (3 diffs)

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

@@ -16 +16 @@
               DVO_FORMAT_PANSTARRS_DEV_0,
               DVO_FORMAT_PANSTARRS_DEV_1,
-              DVO_FORMAT_PS1_DEV_1
+              DVO_FORMAT_PS1_DEV_1,
+              DVO_FORMAT_PS1_DEV_2
 } DVOTableFormat;
 
@@ -215 +216 @@
   struct Catalog *secfilt_catalog;              /* secfilt catalog data (split) */
 
+  unsigned int objID;
+  unsigned int catID;
+
   /* extra catalog information */
   int lockmode;
@@ -383 +387 @@
 # include "panstarrs_dev_1_defs.h"
 # include "ps1_dev_1_defs.h"
+# include "ps1_dev_2_defs.h"
 
 /*** DVO image db I/O Functions ***/