Changeset 5228

Timestamp:

Oct 6, 2005, 6:08:40 AM (21 years ago)

Author:

eugene

Message:

renamed phot_catalog... to dvo_catalog..., added SPLIT mode, added SPLIT support to Catalog

Location:

trunk/Ohana/src/libohana

Files:

• Makefile (modified) (1 diff)
• include/dvo.h (modified) (4 diffs)
• src/dvo_catalog.c (added)
• src/dvo_catalog_mef.c (added)
• src/dvo_catalog_raw.c (added)
• src/dvo_catalog_split.c (added)
• src/phot_catalog.c (deleted)
• src/phot_catalog_mef.c (deleted)
• src/phot_catalog_raw.c (deleted)

trunk/Ohana/src/libohana/Makefile

@@ -47 +47 @@
 $(SRC)/fits_db.$(ARCH).o         \
 $(SRC)/photfits.$(ARCH).o        \
-$(SRC)/dvo_image.$(ARCH).o           \
-$(SRC)/dvo_image_raw.$(ARCH).o           \
-$(SRC)/phot_catalog.$(ARCH).o    \
-$(SRC)/phot_catalog_mef.$(ARCH).o      \
-$(SRC)/phot_catalog_raw.$(ARCH).o      \
+$(SRC)/dvo_image.$(ARCH).o       \
+$(SRC)/dvo_image_raw.$(ARCH).o   \
+$(SRC)/dvo_catalog.$(ARCH).o     \
+$(SRC)/dvo_catalog_raw.$(ARCH).o       \
+$(SRC)/dvo_catalog_mef.$(ARCH).o       \
+$(SRC)/dvo_catalog_split.$(ARCH).o     \
 $(SRC)/dvo_convert.$(ARCH).o           \
 $(SRC)/dvo_convert_elixir.$(ARCH).o    \

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

@@ -118 +118 @@
 
 /* a catalog contains this data */
-typedef struct {
-  /* description of the catalog file: */
-  char *filename;
-  int lockmode;
-  FILE *f;
-
-  /* extra table data if needed (move these to enums?) */
-  # if (0)
-  char catmode[10];         /* storage mode: raw, mef, split, mysql */
-  char average_format[80];  /* table format: internal, loneos, elixir, panstarrs */
-  char measure_format[80];  /* table format: must match average_format */
-  char secfilt_format[80];  /* table format: must match average_format */
-  # endif
-
-  int catmode;
-  int catformat;
-  
-  /* data in the catalog */
+typedef struct Catalog {
+  char *filename;                       /* catalog file */
+  FILE *f;                              /* file descriptor */
   Header  header;
+
+  /* data in the catalog file */
   Average *average;
   Measure *measure; 
@@ -143 +130 @@
   int Naverage, Nmeasure, Nmissing, Nsecfilt;
 
+  /* pointers to split data files */
+  struct Catalog *measure_catalog;              /* measure catalog data (split) */
+  struct Catalog *missing_catalog;              /* missing catalog data (split) */
+  struct Catalog *secfilt_catalog;              /* secfilt catalog data (split) */
+
+  /* extra catalog information */
+  int lockmode;
+  int catmode;                          /* storage mode (raw, mef, split, mysql) */
+  int catformat;                        /* storage format (elixir, panstarrs, etc) */
+  int ordered;                          /* is measure table average-ordered? */
+  
   /* pointers for data manipulation */
   int *found;
@@ -149 +147 @@
   float *X;
   float *Y;
+
 } Catalog;
 
@@ -290 +289 @@
 int load_catalog_mef (Catalog *catalog, char mode, int VERBOSE);
 int save_catalog_mef (Catalog *catalog, char VERBOSE);
+int load_catalog_split (Catalog *catalog, char mode, int VERBOSE);
+int save_catalog_split (Catalog *catalog, char VERBOSE);
 
 /*** DVO image db I/O Functions ***/