Index: trunk/Ohana/src/libohana/include/dvo.h
===================================================================
--- trunk/Ohana/src/libohana/include/dvo.h	(revision 3536)
+++ trunk/Ohana/src/libohana/include/dvo.h	(revision 3609)
@@ -1,9 +1,51 @@
+# include <autocode.h>
 
 # ifndef DVO_H
 # define DVO_H
 
-# define ELIXIR    1
-# define LONEOS    0
-# define PANSTARRS 0
+/*** FITS DB structure  ***/
+typedef struct {
+  FILE  *f;
+  char  *filename;
+  int    dbstate;
+  int    lockstate;
+  double timeout;
+  Header header;
+  Matrix matrix;
+  Header theader;
+  FTable ftable;
+} FITS_DB;
+
+/* the standard astrometric coordinates structure */
+typedef struct {
+  double   crval1, crval2;
+  float    crpix1, crpix2;
+  float    cdelt1, cdelt2;
+  float    pc1_1, pc1_2;
+  float    pc2_1, pc2_2;
+  float    polyterms[7][2];
+  char     ctype[15];
+  char     Npolyterms;
+} Coords;  /* 120 bytes / Coords */
+
+/* in fits_db.c */
+int   fits_db_init                PROTO((FITS_DB *db));
+int   fits_db_create              PROTO((FITS_DB *db));
+int   fits_db_lock                PROTO((FITS_DB *db, char *filename));
+int   fits_db_load                PROTO((FITS_DB *db));
+int   fits_db_close               PROTO((FITS_DB *db));
+int   fits_db_free                PROTO((FITS_DB *db));
+int   fits_db_save                PROTO((FITS_DB *db));
+int   fits_db_update              PROTO((FITS_DB *db, VTable *vtable));
+
+/* in coords.c */
+int  XY_to_RD (double *ra, double *dec, double x,  double y,   Coords *coords);
+int  RD_to_XY (double *x,  double *y,   double ra, double dec, Coords *coords);
+int  fXY_to_RD (float *ra, float *dec, double x,  double y,   Coords *coords);
+int  fRD_to_XY (float *x,  float *y,   double ra, double dec, Coords *coords);
+int  GetCoords (Coords *coords, Header *header);
+int  PutCoords (Coords *coords, Header *header);
+void RegisterMosaic (Coords *coords);
+void coords_precess (double *ra, double *dec, double in_epoch, double out_epoch);
 
 /* image data modes in RegImage */
@@ -75,51 +117,10 @@
 */
 
-/*** FITS DB structure  ***/
-typedef struct {
-  FILE  *f;
-  char  *filename;
-  int    dbstate;
-  int    lockstate;
-  double timeout;
-  Header header;
-  Matrix matrix;
-  Header theader;
-  FTable ftable;
-} FITS_DB;
+/** we are going to replace these with autocode and appropriate conversions 
+    for now, choose the appropriate table version **/
 
-/* the standard astrometric coordinates structure */
-typedef struct {
-  double   crval1, crval2;
-  float    crpix1, crpix2;
-  float    cdelt1, cdelt2;
-  float    pc1_1, pc1_2;
-  float    pc2_1, pc2_2;
-  float    polyterms[7][2];
-  char     ctype[15];
-  char     Npolyterms;
-} Coords;  /* 120 bytes / Coords */
-
-/*** FITS_DB functions ***/
-
-/* in fits_db.c */
-int   fits_db_init                PROTO((FITS_DB *db));
-int   fits_db_lock                PROTO((FITS_DB *db, char *filename));
-int   fits_db_load                PROTO((FITS_DB *db));
-int   fits_db_close               PROTO((FITS_DB *db));
-int   fits_db_free                PROTO((FITS_DB *db));
-int   fits_db_save                PROTO((FITS_DB *db));
-int   fits_db_update              PROTO((FITS_DB *db, VTable *vtable));
-
-/* in coords.c */
-int  XY_to_RD (double *ra, double *dec, double x,  double y,   Coords *coords);
-int  RD_to_XY (double *x,  double *y,   double ra, double dec, Coords *coords);
-int  fXY_to_RD (float *ra, float *dec, double x,  double y,   Coords *coords);
-int  fRD_to_XY (float *x,  float *y,   double ra, double dec, Coords *coords);
-int  GetCoords (Coords *coords, Header *header);
-int  PutCoords (Coords *coords, Header *header);
-void RegisterMosaic (Coords *coords);
-void coords_precess (double *ra, double *dec, double in_epoch, double out_epoch);
-
-# include <autocode.h>
+# define ELIXIR    1
+# define LONEOS    0
+# define PANSTARRS 0
 
 # if (LONEOS)
@@ -135,5 +136,8 @@
 # endif
 
-/* these functions refer to the DVO structures define in the includes above */
+/* these functions refer to the DVO structures defined in the includes above 
+ *  they are being replaced with autocode entries
+ */
+
 int   Fread (void *ptr, int size, int nitems, FILE *f, char *type);
 int   Fwrite (void *ptr, int size, int nitems, FILE *f, char *type);