Index: trunk/Ohana/src/libdvo/include/dvo.h =================================================================== --- trunk/Ohana/src/libdvo/include/dvo.h (revision 25757) +++ trunk/Ohana/src/libdvo/include/dvo.h (revision 27435) @@ -10,15 +10,16 @@ /* DVO table formats */ -typedef enum {DVO_FORMAT_UNDEF, - DVO_FORMAT_INTERNAL, - DVO_FORMAT_ELIXIR, - DVO_FORMAT_LONEOS, - DVO_FORMAT_PANSTARRS_DEV_0, - DVO_FORMAT_PANSTARRS_DEV_1, - DVO_FORMAT_PS1_DEV_1, - DVO_FORMAT_PS1_DEV_2, - DVO_FORMAT_PS1_DEV_3, - DVO_FORMAT_PS1_V1, - DVO_FORMAT_PS1_REF +typedef enum { + DVO_FORMAT_UNDEF, + DVO_FORMAT_INTERNAL, + DVO_FORMAT_ELIXIR, + DVO_FORMAT_LONEOS, + DVO_FORMAT_PANSTARRS_DEV_0, + DVO_FORMAT_PANSTARRS_DEV_1, + DVO_FORMAT_PS1_DEV_1, + DVO_FORMAT_PS1_DEV_2, + DVO_FORMAT_PS1_DEV_3, + DVO_FORMAT_PS1_V1, + DVO_FORMAT_PS1_REF } DVOTableFormat; @@ -155,6 +156,4 @@ FILE *f; char *filename; - int dbstate; - int lockstate; double timeout; Header header; @@ -163,8 +162,10 @@ FTable ftable; VTable vtable; - int mode; /* what data storage mode is used for disk file? */ - int format; /* what data format is used for disk file? */ - int virtual; /* is table in ftable or vtable? */ - int swapped; /* is table in internal byte-order? */ + int dbstate; + char lockstate; + char mode; /* what data storage mode is used for disk file? */ + char format; /* what data format is used for disk file? */ + char virtual; /* is table in ftable or vtable? */ + char swapped; /* is table in internal byte-order? */ } FITS_DB; @@ -174,5 +175,5 @@ /* SkyRegion : better implementation than GSCRegion */ typedef struct { - int Nregions; + off_t Nregions; char **filename; SkyRegion *regions; @@ -180,5 +181,5 @@ typedef struct { - int Nregions; + off_t Nregions; int ownElements; /* does this list own filename, regions? */ char **filename; @@ -187,13 +188,5 @@ // special-case function: -CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, int *Ndata, int *swapped); - -# if (0) -/* structure for data on a catalog region */ -typedef struct { - char filename[256]; - double DEC[2], RA[2]; -} GSCRegion; -# endif +CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, off_t *Ndata, char *swapped); typedef struct { @@ -219,7 +212,9 @@ int Nsecfilt; /* number of secfilt entries for each average entry */ - int Naverage, Nmeasure, Nmissing, Nsecf_mem; /* current number of each component in memory */ - int Naves_disk, Nmeas_disk, Nmiss_disk, Nsecf_disk; /* current number of each component on disk */ - int Naves_off, Nmeas_off, Nmiss_off, Nsecf_off; /* index of first loaded data value */ + off_t Naverage, Nmeasure, Nmissing, Nsecf_mem; /* current number of each component in memory */ + off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nsecf_disk; /* current number of each component on disk */ + off_t Naves_off, Nmeas_off, Nmiss_off, Nsecf_off; /* index of first loaded data value */ + + /* the Nsecf_* values above are number of table rows (eg, Naverage*Nsecfilt) */ /* note the different counting for Nsecfilt: @@ -239,14 +234,14 @@ /* extra catalog information */ - int lockmode; - int catmode; /* storage mode (raw, mef, split, mysql) */ - int catformat; /* storage format (elixir, panstarrs, etc) */ - int catflags; /* choices to be loaded */ - int sorted; /* is measure table average-sorted? */ + char lockmode; + char catmode; /* storage mode (raw, mef, split, mysql) */ + char catformat; /* storage format (elixir, panstarrs, etc) */ + char catflags; /* choices to be loaded */ + char sorted; /* is measure table average-sorted? */ /* pointers for data manipulation */ - int *found; - int *image; - int *mosaic; + off_t *found; + off_t *image; + off_t *mosaic; float *X; float *Y; @@ -261,5 +256,5 @@ int gfits_db_lock PROTO((FITS_DB *db, char *filename)); int gfits_db_load PROTO((FITS_DB *db)); -int gfits_db_load_segment PROTO((FITS_DB *db, int start, int Nrows)); +int gfits_db_load_segment PROTO((FITS_DB *db, off_t start, off_t Nrows)); int gfits_db_save PROTO((FITS_DB *db)); int gfits_db_update PROTO((FITS_DB *db)); @@ -287,10 +282,10 @@ int isRegisteredMosaic (void); -int GetRegisteredMosaic (void); +off_t GetRegisteredMosaic (void); int GetMosaicCoords (Coords *coords); -int FindMosaicForImage (Image *images, int Nimages, int entry); -int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry); -int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry); -int BuildChipMatch (Image *images, int Nimages); +int FindMosaicForImage (Image *images, off_t Nimages, off_t entry); +int FindMosaicForImage_TableSearch (Image *images, off_t Nimages, off_t entry); +int FindMosaicForImage_MatchSearch (Image *images, off_t Nimages, off_t entry); +int BuildChipMatch (Image *images, off_t Nimages); void SetImageCorners (double *X, double *Y, Image *image); @@ -347,13 +342,4 @@ int get_image_mode (char *name); char *get_mode_name (int mode); - -/* these functions refer to the DVO structures defined in the includes above - * they are being replaced with autocode entries (drop when totally autocoded) - */ - -int Fread (void *ptr, int size, int nitems, FILE *f, char *type); -int Fwrite (void *ptr, int size, int nitems, FILE *f, char *type); -int ByteSwap (char *ptr, int size, int nitems, char *type); -int ConvertStruct (char *buffer, int size, int Nbytes, char *type); /** dvo_catalog APIs */ @@ -384,25 +370,25 @@ int dvo_catalog_save_split_complete (Catalog *catalog, char VERBOSE); -int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, int start, int Nrows); -int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, int start, int Nrows); +int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, off_t start, off_t Nrows); +int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, off_t start, off_t Nrows); /*** conversion functions / I/O conversions ***/ -Average *ReadRawAverage (FILE *f, int Naverage, int format, SecFilt **primary); -Measure *ReadRawMeasure (FILE *f, int Nmeasure, int format); -SecFilt *ReadRawSecFilt (FILE *f, int Nsecfilt, int format); -int WriteRawAverage (FILE *f, Average *average, int Naverage, int format, SecFilt *primary); -int WriteRawMeasure (FILE *f, Measure *measure, int Nmeasure, int format); -int WriteRawSecFilt (FILE *f, SecFilt *secfilt, int Nsecfilt, int format); - -Average *FtableToAverage (FTable *ftable, int *Naverage, int *format, SecFilt **primary); -Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format); -SecFilt *FtableToSecFilt (FTable *ftable, int *Nsecfilt, int *format); -int FtableToImage (FTable *ftable, Header *theader, int *format); - -int AverageToFtable (FTable *ftable, Average *average, int Naverage, int format, SecFilt *primary); -int MeasureToFtable (FTable *ftable, Measure *measure, int Nmeasure, int format); -int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format); -int ImageToFtable (FTable *ftable, Header *theader, int format); -int ImageToVtable (VTable *vtable, Header *theader, int format); +Average *ReadRawAverage (FILE *f, off_t Naverage, char format, SecFilt **primary); +Measure *ReadRawMeasure (FILE *f, off_t Nmeasure, char format); +SecFilt *ReadRawSecFilt (FILE *f, off_t Nsecfilt, char format); +int WriteRawAverage (FILE *f, Average *average, off_t Naverage, char format, SecFilt *primary); +int WriteRawMeasure (FILE *f, Measure *measure, off_t Nmeasure, char format); +int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format); + +Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary); +Measure *FtableToMeasure (FTable *ftable, off_t *Nmeasure, char *format); +SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format); +int FtableToImage (FTable *ftable, Header *theader, char *format); + +int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary); +int MeasureToFtable (FTable *ftable, Measure *measure, off_t Nmeasure, char format); +int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format); +int ImageToFtable (FTable *ftable, Header *theader, char format); +int ImageToVtable (VTable *vtable, Header *theader, char format); # include "loneos_defs.h" @@ -425,5 +411,5 @@ int dvo_image_update_raw (FITS_DB *db, int VERBOSE); int dvo_image_save_raw (FITS_DB *db, int VERBOSE); -int dvo_image_addrows (FITS_DB *db, Image *new, int Nnew); +int dvo_image_addrows (FITS_DB *db, Image *new, off_t Nnew); void dvo_image_create (FITS_DB *db, double ZeroPoint); @@ -454,8 +440,8 @@ /* dvo-specific sorting functions */ -void sortave (Average *ave, int N); -void sort_image_subset (Image *image, int *subset, int N); -void sort_coords_index (double *X, double *Y, int *S, int N); -void sort_regions (SkyRegion *region, int N); +void sortave (Average *ave, off_t N); +void sort_image_subset (Image *image, off_t *subset, off_t N); +void sort_coords_index (double *X, double *Y, off_t *S, off_t N); +void sort_regions (SkyRegion *region, off_t N); # endif