Changeset 5234 for trunk/Ohana/src/libohana/include/dvo.h

Timestamp:

Oct 7, 2005, 6:33:25 AM (21 years ago)

Author:

eugene

Message:

working on the update concept, added split table support

File:

• trunk/Ohana/src/libohana/include/dvo.h (modified) (5 diffs)

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

@@ -24 +24 @@
 
 /* catalog values to be loaded */
-# define LOAD_AVES 0x01
-# define LOAD_MEAS 0x02
-# define LOAD_MISS 0x04
-# define LOAD_SECF 0x08
+# define LOAD_AVES      0x01
+# define LOAD_MEAS      0x02
+# define LOAD_MISS      0x04
+# define LOAD_SECF      0x08 
+# define LOAD_MEAS_META 0x10
 
 /* invalid mag value */
@@ -128 +129 @@
   Missing *missing; 
   SecFilt *secfilt;
-  int Naverage, Nmeasure, Nmissing, Nsecfilt;
+  int Naverage, Nmeasure, Nmissing, Nsecfilt;   /* current number of each component */
+  int Nave_disk, Nmeas_disk, Nmiss_disk;        /* number of component on disk */
+  int Nmeas_off;                                /* dist seq of first loaded data value */
+  /* note the different counting for Nsecfilt */
 
   /* pointers to split data files */
@@ -139 +143 @@
   int catmode;                          /* storage mode (raw, mef, split, mysql) */
   int catformat;                        /* storage format (elixir, panstarrs, etc) */
-  int ordered;                          /* is measure table average-ordered? */
+  int sorted;                           /* is measure table average-sorted? */
   
   /* pointers for data manipulation */
@@ -177 +181 @@
 int load_catalog (Catalog *catalog, char mode, int VERBOSE);
 int save_catalog (Catalog *catalog, char VERBOSE);
+int update_catalog (Catalog *catalog, char VERBOSE);
 
 int FindMosaicForImage (Image *images, int Nimages, int entry);
@@ -291 +296 @@
 int load_catalog_split (Catalog *catalog, char mode, int VERBOSE);
 int save_catalog_split (Catalog *catalog, char VERBOSE);
+int update_catalog_split (Catalog *catalog, char VERBOSE);
 
 /*** DVO image db I/O Functions ***/