IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 24, 2010, 11:22:25 AM (16 years ago)
Author:
eugene
Message:

large update merging in changes for Ohana to support large files

Location:
trunk/Ohana
Files:
1 deleted
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

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

    r25757 r27435  
    1010
    1111/* DVO table formats */
    12 typedef enum {DVO_FORMAT_UNDEF,
    13               DVO_FORMAT_INTERNAL,
    14               DVO_FORMAT_ELIXIR,
    15               DVO_FORMAT_LONEOS,
    16               DVO_FORMAT_PANSTARRS_DEV_0,
    17               DVO_FORMAT_PANSTARRS_DEV_1,
    18               DVO_FORMAT_PS1_DEV_1,
    19               DVO_FORMAT_PS1_DEV_2,
    20               DVO_FORMAT_PS1_DEV_3,
    21               DVO_FORMAT_PS1_V1,
    22               DVO_FORMAT_PS1_REF
     12typedef enum {
     13  DVO_FORMAT_UNDEF,
     14  DVO_FORMAT_INTERNAL,
     15  DVO_FORMAT_ELIXIR,
     16  DVO_FORMAT_LONEOS,
     17  DVO_FORMAT_PANSTARRS_DEV_0,
     18  DVO_FORMAT_PANSTARRS_DEV_1,
     19  DVO_FORMAT_PS1_DEV_1,
     20  DVO_FORMAT_PS1_DEV_2,
     21  DVO_FORMAT_PS1_DEV_3,
     22  DVO_FORMAT_PS1_V1,
     23  DVO_FORMAT_PS1_REF
    2324} DVOTableFormat;
    2425
    … …  
    155156  FILE  *f;
    156157  char  *filename;
    157   int    dbstate;
    158   int    lockstate;
    159158  double timeout;
    160159  Header header;
    … …  
    163162  FTable ftable;
    164163  VTable vtable;
    165   int    mode;          /* what data storage mode is used for disk file? */
    166   int    format;        /* what data format is used for disk file? */
    167   int    virtual;       /* is table in ftable or vtable? */
    168   int    swapped;       /* is table in internal byte-order? */
     164  int    dbstate;
     165  char   lockstate;
     166  char   mode;          /* what data storage mode is used for disk file? */
     167  char   format;        /* what data format is used for disk file? */
     168  char   virtual;       /* is table in ftable or vtable? */
     169  char   swapped;       /* is table in internal byte-order? */
    169170} FITS_DB;
    170171
    … …  
    174175/* SkyRegion : better implementation than GSCRegion */
    175176typedef struct {
    176   int Nregions;
     177  off_t Nregions;
    177178  char **filename;
    178179  SkyRegion *regions;
    … …  
    180181
    181182typedef struct {
    182   int Nregions;
     183  off_t Nregions;
    183184  int ownElements;                                /* does this list own filename, regions? */
    184185  char **filename;
    … …  
    187188
    188189// special-case function:
    189 CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, int *Ndata, int *swapped);
    190 
    191 # if (0)
    192 /* structure for data on a catalog region */
    193 typedef struct {
    194   char filename[256];
    195   double DEC[2], RA[2];
    196 } GSCRegion;
    197 # endif
     190CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, off_t *Ndata, char *swapped);
    198191
    199192typedef struct {
    … …  
    219212
    220213  int Nsecfilt;  /* number of secfilt entries for each average entry */
    221   int Naverage,   Nmeasure,   Nmissing,   Nsecf_mem;  /* current number of each component in memory */
    222   int Naves_disk, Nmeas_disk, Nmiss_disk, Nsecf_disk; /* current number of each component on disk */
    223   int Naves_off,  Nmeas_off,  Nmiss_off,  Nsecf_off;  /* index of first loaded data value */
     214  off_t Naverage,   Nmeasure,   Nmissing,   Nsecf_mem;  /* current number of each component in memory */
     215  off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nsecf_disk; /* current number of each component on disk */
     216  off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nsecf_off;  /* index of first loaded data value */
     217
     218  /* the Nsecf_* values above are number of table rows (eg, Naverage*Nsecfilt) */
    224219
    225220  /* note the different counting for Nsecfilt:
    … …  
    239234
    240235  /* extra catalog information */
    241   int lockmode;
    242   int catmode;                          /* storage mode (raw, mef, split, mysql) */
    243   int catformat;                        /* storage format (elixir, panstarrs, etc) */
    244   int catflags;                         /* choices to be loaded */
    245   int sorted;                           /* is measure table average-sorted? */
     236  char lockmode;
     237  char catmode;                         /* storage mode (raw, mef, split, mysql) */
     238  char catformat;                       /* storage format (elixir, panstarrs, etc) */
     239  char catflags;                                /* choices to be loaded */
     240  char sorted;                          /* is measure table average-sorted? */
    246241 
    247242  /* pointers for data manipulation */
    248   int *found;
    249   int *image;
    250   int *mosaic;
     243  off_t *found;
     244  off_t *image;
     245  off_t *mosaic;
    251246  float *X;
    252247  float *Y;
    … …  
    261256int   gfits_db_lock                PROTO((FITS_DB *db, char *filename));
    262257int   gfits_db_load                PROTO((FITS_DB *db));
    263 int   gfits_db_load_segment        PROTO((FITS_DB *db, int start, int Nrows));
     258int   gfits_db_load_segment        PROTO((FITS_DB *db, off_t start, off_t Nrows));
    264259int   gfits_db_save                PROTO((FITS_DB *db));
    265260int   gfits_db_update              PROTO((FITS_DB *db));
    … …  
    287282
    288283int isRegisteredMosaic (void);
    289 int GetRegisteredMosaic (void);
     284off_t GetRegisteredMosaic (void);
    290285int GetMosaicCoords (Coords *coords);
    291 int FindMosaicForImage (Image *images, int Nimages, int entry);
    292 int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry);
    293 int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry);
    294 int BuildChipMatch (Image *images, int Nimages);
     286int FindMosaicForImage (Image *images, off_t Nimages, off_t entry);
     287int FindMosaicForImage_TableSearch (Image *images, off_t Nimages, off_t entry);
     288int FindMosaicForImage_MatchSearch (Image *images, off_t Nimages, off_t entry);
     289int BuildChipMatch (Image *images, off_t Nimages);
    295290void SetImageCorners (double *X, double *Y, Image *image);
    296291
    … …  
    347342int get_image_mode (char *name);
    348343char *get_mode_name (int mode);
    349 
    350 /* these functions refer to the DVO structures defined in the includes above
    351  *  they are being replaced with autocode entries (drop when totally autocoded)
    352  */
    353 
    354 int   Fread (void *ptr, int size, int nitems, FILE *f, char *type);
    355 int   Fwrite (void *ptr, int size, int nitems, FILE *f, char *type);
    356 int   ByteSwap (char *ptr, int size, int nitems, char *type);
    357 int   ConvertStruct (char *buffer, int size, int Nbytes, char *type);
    358344
    359345/** dvo_catalog APIs */
    … …  
    384370int dvo_catalog_save_split_complete (Catalog *catalog, char VERBOSE);
    385371
    386 int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, int start, int Nrows);
    387 int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, int start, int Nrows);
     372int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, off_t start, off_t Nrows);
     373int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, off_t start, off_t Nrows);
    388374
    389375/*** conversion functions / I/O conversions ***/
    390 Average *ReadRawAverage (FILE *f, int Naverage, int format, SecFilt **primary);
    391 Measure *ReadRawMeasure (FILE *f, int Nmeasure, int format);
    392 SecFilt *ReadRawSecFilt (FILE *f, int Nsecfilt, int format);
    393 int WriteRawAverage (FILE *f, Average *average, int Naverage, int format, SecFilt *primary);
    394 int WriteRawMeasure (FILE *f, Measure *measure, int Nmeasure, int format);
    395 int WriteRawSecFilt (FILE *f, SecFilt *secfilt, int Nsecfilt, int format);
    396 
    397 Average *FtableToAverage (FTable *ftable, int *Naverage, int *format, SecFilt **primary);
    398 Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format);
    399 SecFilt *FtableToSecFilt (FTable *ftable, int *Nsecfilt, int *format);
    400 int FtableToImage (FTable *ftable, Header *theader, int *format);
    401 
    402 int AverageToFtable (FTable *ftable, Average *average, int Naverage, int format, SecFilt *primary);
    403 int MeasureToFtable (FTable *ftable, Measure *measure, int Nmeasure, int format);
    404 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format);
    405 int ImageToFtable (FTable *ftable, Header *theader, int format);
    406 int ImageToVtable (VTable *vtable, Header *theader, int format);
     376Average *ReadRawAverage (FILE *f, off_t Naverage, char format, SecFilt **primary);
     377Measure *ReadRawMeasure (FILE *f, off_t Nmeasure, char format);
     378SecFilt *ReadRawSecFilt (FILE *f, off_t Nsecfilt, char format);
     379int WriteRawAverage (FILE *f, Average *average, off_t Naverage, char format, SecFilt *primary);
     380int WriteRawMeasure (FILE *f, Measure *measure, off_t Nmeasure, char format);
     381int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format);
     382
     383Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary);
     384Measure *FtableToMeasure (FTable *ftable, off_t *Nmeasure, char *format);
     385SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format);
     386int      FtableToImage   (FTable *ftable, Header *theader, char *format);
     387
     388int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary);
     389int MeasureToFtable (FTable *ftable, Measure *measure, off_t Nmeasure, char format);
     390int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format);
     391int ImageToFtable (FTable *ftable, Header *theader, char format);
     392int ImageToVtable (VTable *vtable, Header *theader, char format);
    407393
    408394# include "loneos_defs.h"
    … …  
    425411int dvo_image_update_raw (FITS_DB *db, int VERBOSE);
    426412int dvo_image_save_raw (FITS_DB *db, int VERBOSE);
    427 int dvo_image_addrows (FITS_DB *db, Image *new, int Nnew);
     413int dvo_image_addrows (FITS_DB *db, Image *new, off_t Nnew);
    428414void dvo_image_create (FITS_DB *db, double ZeroPoint);
    429415
    … …  
    454440
    455441/* dvo-specific sorting functions */
    456 void sortave (Average *ave, int N);
    457 void sort_image_subset (Image *image, int *subset, int N);
    458 void sort_coords_index (double *X, double *Y, int *S, int N);
    459 void sort_regions (SkyRegion *region, int N);
     442void sortave (Average *ave, off_t N);
     443void sort_image_subset (Image *image, off_t *subset, off_t N);
     444void sort_coords_index (double *X, double *Y, off_t *S, off_t N);
     445void sort_regions (SkyRegion *region, off_t N);
    460446
    461447# endif

  • trunk/Ohana/src/libdvo/include/dvo_util.h

    r26410 r27435  
    99
    1010typedef struct {
    11     char        gscfile[256];
    12     char        catdir[256];
    13     char        catmode[256];
    14     char        catformat[256];
    15     char        photcodeFile[256];
    16     char        skyTableFile[256];
    17     int         skyDepth;
    18     FITS_DB     imageDB;
    19     Image       *images;
    20     int         nImages;
    21     SkyTable    *skyTable;
     11  char        gscfile[256];
     12  char        catdir[256];
     13  char        catmode[256];
     14  char        catformat[256];
     15  char        photcodeFile[256];
     16  char        skyTableFile[256];
     17  int         skyDepth;
     18  FITS_DB     imageDB;
     19  Image      *images;
     20  off_t       nImages;
     21  SkyTable   *skyTable;
    2222#if (DVO_UTIL_READ_CAMERA_CONFIG)
    23     char        cameraConfig[256];
    24     int         *ccdNum;
    25     int         nCCD;
     23  char        cameraConfig[256];
     24  int        *ccdNum;
     25  int         nCCD;
    2626#endif
    2727} dvoConfig;
    … …  
    2929// This structure needs to be fleshed out
    3030typedef struct {
    31     int         valid;
    32     Average     ave;
    33     Measure     meas;
     31  int         valid;
     32  Average     ave;
     33  Measure     meas;
    3434#ifdef notdef
    35     int         objID;
    36     int         catID;
    37     int         detID;
    38     uint64_t    pspsObjID;
    39     uint64_t    pspsDetID;
     35  int         objID;
     36  int         catID;
     37  int         detID;
     38  uint64_t    pspsObjID;
     39  uint64_t    pspsDetID;
    4040#endif
    4141} dvoDetection;
    … …  
    5252dvoConfig *dvoConfigRead(int *argc, char **argv);
    5353
    54 // free's memory associated with the dvoConfig structure
     54// frees memory associated with the dvoConfig structure
    5555void dvoConfigFree(dvoConfig *dvoConfig);
    5656
    … …  
    7070SkyList *dvoSkyListByExternID(dvoConfig *dvoConfig, int sourceID, int externID, Image **ppImage);
    7171
    72 // return a list of detectsions from a particular image id
     72// return a list of detections from a particular image id
    7373// Use dvoFree() to free the memory pointed to by results
    74 int dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID);
     74off_t dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID);
    7575
    7676// free memory returned by various dvo util functions

  • trunk/Ohana/src/libdvo/include/elixir_defs.h

    r15694 r27435  
    1 Image                   *Image_Elixir_ToInternal (Image_Elixir *in, int Nvalues);
    2 Image_Elixir            *ImageInternalTo_Elixir (Image *in, int Nvalues);
    3 Average                 *Average_Elixir_ToInternal (Average_Elixir *in, int Nvalues, SecFilt **primary);
    4 Average_Elixir          *AverageInternalTo_Elixir (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_Elixir_ToInternal (Measure_Elixir *in, int Nvalues);
    6 Measure_Elixir          *MeasureInternalTo_Elixir (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, int Nvalues);
    8 SecFilt_Elixir          *SecFiltInternalTo_Elixir (SecFilt *in, int Nvalues);
     1Image                   *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues);
     2Image_Elixir            *ImageInternalTo_Elixir (Image *in, off_t Nvalues);
     3Average                 *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary);
     4Average_Elixir          *AverageInternalTo_Elixir (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues);
     6Measure_Elixir          *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, off_t Nvalues);
     8SecFilt_Elixir          *SecFiltInternalTo_Elixir (SecFilt *in, off_t Nvalues);
    99
    10 PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, int Nvalues);
    11 PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, int Nvalues);
     10PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, off_t Nvalues);
     11PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/loneos_defs.h

    r15035 r27435  
    1 Image                   *Image_Loneos_ToInternal (Image_Loneos *in, int Nvalues);
    2 Image_Loneos            *ImageInternalTo_Loneos (Image *in, int Nvalues);
    3 Average                 *Average_Loneos_ToInternal (Average_Loneos *in, int Nvalues, SecFilt **primary);
    4 Average_Loneos          *AverageInternalTo_Loneos (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_Loneos_ToInternal (Measure_Loneos *in, int Nvalues);
    6 Measure_Loneos          *MeasureInternalTo_Loneos (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, int Nvalues);
    8 SecFilt_Loneos          *SecFiltInternalTo_Loneos (SecFilt *in, int Nvalues);
     1Image                   *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues);
     2Image_Loneos            *ImageInternalTo_Loneos (Image *in, off_t Nvalues);
     3Average                 *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary);
     4Average_Loneos          *AverageInternalTo_Loneos (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_Loneos_ToInternal (Measure_Loneos *in, off_t Nvalues);
     6Measure_Loneos          *MeasureInternalTo_Loneos (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, off_t Nvalues);
     8SecFilt_Loneos          *SecFiltInternalTo_Loneos (SecFilt *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/panstarrs_dev_0_defs.h

    r15035 r27435  
    1 Image                   *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, int Nvalues);
    2 Image_Panstarrs_DEV_0   *ImageInternalTo_Panstarrs_DEV_0 (Image *in, int Nvalues);
    3 Average                 *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, int Nvalues, SecFilt **primary);
    4 Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, int Nvalues);
    6 Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, int Nvalues);
    8 SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, int Nvalues);
     1Image                   *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues);
     2Image_Panstarrs_DEV_0   *ImageInternalTo_Panstarrs_DEV_0 (Image *in, off_t Nvalues);
     3Average                 *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, off_t Nvalues, SecFilt **primary);
     4Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, off_t Nvalues);
     6Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, off_t Nvalues);
     8SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/panstarrs_dev_1_defs.h

    r15035 r27435  
    1 Image                   *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, int Nvalues);
    2 Image_Panstarrs_DEV_1   *ImageInternalTo_Panstarrs_DEV_1 (Image *in, int Nvalues);
    3 Average                 *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, int Nvalues, SecFilt **primary);
    4 Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, int Nvalues);
    6 Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, int Nvalues);
    8 SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, int Nvalues);
     1Image                   *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues);
     2Image_Panstarrs_DEV_1   *ImageInternalTo_Panstarrs_DEV_1 (Image *in, off_t Nvalues);
     3Average                 *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, off_t Nvalues, SecFilt **primary);
     4Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, off_t Nvalues);
     6Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, off_t Nvalues);
     8SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/ps1_dev_1_defs.h

    r15694 r27435  
    1 Image                   *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, int Nvalues);
    2 Image_PS1_DEV_1         *ImageInternalTo_PS1_DEV_1 (Image *in, int Nvalues);
    3 Average                 *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, int Nvalues, SecFilt **primary);
    4 Average_PS1_DEV_1       *AverageInternalTo_PS1_DEV_1 (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, int Nvalues);
    6 Measure_PS1_DEV_1       *MeasureInternalTo_PS1_DEV_1 (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, int Nvalues);
    8 SecFilt_PS1_DEV_1       *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, int Nvalues);
     1Image                   *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues);
     2Image_PS1_DEV_1         *ImageInternalTo_PS1_DEV_1 (Image *in, off_t Nvalues);
     3Average                 *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, off_t Nvalues, SecFilt **primary);
     4Average_PS1_DEV_1       *AverageInternalTo_PS1_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, off_t Nvalues);
     6Measure_PS1_DEV_1       *MeasureInternalTo_PS1_DEV_1 (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, off_t Nvalues);
     8SecFilt_PS1_DEV_1       *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, off_t Nvalues);
    99
    10 PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, int Nvalues);
    11 PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, int Nvalues);
     10PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, off_t Nvalues);
     11PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/ps1_dev_2_defs.h

    r16810 r27435  
    1 Image                   *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, int Nvalues);
    2 Image_PS1_DEV_2         *ImageInternalTo_PS1_DEV_2 (Image *in, int Nvalues);
    3 Average                 *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, int Nvalues, SecFilt **primary);
    4 Average_PS1_DEV_2       *AverageInternalTo_PS1_DEV_2 (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, int Nvalues);
    6 Measure_PS1_DEV_2       *MeasureInternalTo_PS1_DEV_2 (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, int Nvalues);
    8 SecFilt_PS1_DEV_2       *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, int Nvalues);
     1Image                   *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues);
     2Image_PS1_DEV_2         *ImageInternalTo_PS1_DEV_2 (Image *in, off_t Nvalues);
     3Average                 *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, off_t Nvalues, SecFilt **primary);
     4Average_PS1_DEV_2       *AverageInternalTo_PS1_DEV_2 (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, off_t Nvalues);
     6Measure_PS1_DEV_2       *MeasureInternalTo_PS1_DEV_2 (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, off_t Nvalues);
     8SecFilt_PS1_DEV_2       *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, off_t Nvalues);
    99
    10 PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, int Nvalues);
    11 PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, int Nvalues);
     10PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, off_t Nvalues);
     11PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/ps1_dev_3_defs.h

    r20936 r27435  
    1 Image                   *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, int Nvalues);
    2 Image_PS1_DEV_3         *ImageInternalTo_PS1_DEV_3 (Image *in, int Nvalues);
     1Image                   *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues);
     2Image_PS1_DEV_3         *ImageInternalTo_PS1_DEV_3 (Image *in, off_t Nvalues);
    33
    4 PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, int Nvalues);
    5 PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, int Nvalues);
     4PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, off_t Nvalues);
     5PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/ps1_ref_defs.h

    r24748 r27435  
    1 Image                   *Image_PS1_REF_ToInternal (Image_PS1_REF *in, int Nvalues);
    2 Image_PS1_REF           *ImageInternalTo_PS1_REF (Image *in, int Nvalues);
    3 Average                 *Average_PS1_REF_ToInternal (Average_PS1_REF *in, int Nvalues, SecFilt **primary);
    4 Average_PS1_REF          *AverageInternalTo_PS1_REF (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, int Nvalues);
    6 Measure_PS1_REF          *MeasureInternalTo_PS1_REF (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, int Nvalues);
    8 SecFilt_PS1_REF          *SecFiltInternalTo_PS1_REF (SecFilt *in, int Nvalues);
     1Image                   *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues);
     2Image_PS1_REF           *ImageInternalTo_PS1_REF (Image *in, off_t Nvalues);
     3Average                 *Average_PS1_REF_ToInternal (Average_PS1_REF *in, off_t Nvalues, SecFilt **primary);
     4Average_PS1_REF          *AverageInternalTo_PS1_REF (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, off_t Nvalues);
     6Measure_PS1_REF          *MeasureInternalTo_PS1_REF (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, off_t Nvalues);
     8SecFilt_PS1_REF          *SecFiltInternalTo_PS1_REF (SecFilt *in, off_t Nvalues);
    99
    10 PhotCode                *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, int Nvalues);
    11 PhotCode_PS1_REF         *PhotCode_Internal_To_PS1_REF (PhotCode *in, int Nvalues);
     10PhotCode                *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, off_t Nvalues);
     11PhotCode_PS1_REF         *PhotCode_Internal_To_PS1_REF (PhotCode *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/include/ps1_v1_defs.h

    r21508 r27435  
    1 Image                   *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, int Nvalues);
    2 Image_PS1_V1            *ImageInternalTo_PS1_V1 (Image *in, int Nvalues);
    3 Average                 *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, int Nvalues, SecFilt **primary);
    4 Average_PS1_V1          *AverageInternalTo_PS1_V1 (Average *in, int Nvalues, SecFilt *primary);
    5 Measure                 *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, int Nvalues);
    6 Measure_PS1_V1          *MeasureInternalTo_PS1_V1 (Measure *in, int Nvalues);
    7 SecFilt                 *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, int Nvalues);
    8 SecFilt_PS1_V1          *SecFiltInternalTo_PS1_V1 (SecFilt *in, int Nvalues);
     1Image                   *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues);
     2Image_PS1_V1            *ImageInternalTo_PS1_V1 (Image *in, off_t Nvalues);
     3Average                 *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, off_t Nvalues, SecFilt **primary);
     4Average_PS1_V1          *AverageInternalTo_PS1_V1 (Average *in, off_t Nvalues, SecFilt *primary);
     5Measure                 *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, off_t Nvalues);
     6Measure_PS1_V1          *MeasureInternalTo_PS1_V1 (Measure *in, off_t Nvalues);
     7SecFilt                 *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, off_t Nvalues);
     8SecFilt_PS1_V1          *SecFiltInternalTo_PS1_V1 (SecFilt *in, off_t Nvalues);
    99
    10 PhotCode                *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, int Nvalues);
    11 PhotCode_PS1_V1         *PhotCode_Internal_To_PS1_V1 (PhotCode *in, int Nvalues);
     10PhotCode                *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, off_t Nvalues);
     11PhotCode_PS1_V1         *PhotCode_Internal_To_PS1_V1 (PhotCode *in, off_t Nvalues);

  • trunk/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

    r24748 r27435  
    1111  char extname[80];
    1212
    13   int i, code, Ncode, Nsec, Nsecfilt;
     13  int i, code, Nsec, Nsecfilt;
     14  off_t Ncode;
    1415
    1516  /* XXX choose more sensible lock timeouts! */

  • trunk/Ohana/src/libdvo/src/cmf-ps1-v1-alt.c

    r24400 r27435  
    11# include "dvo.h"
    22
    3 CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, int *Ndata, int *swapped) {
     3CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, off_t *Ndata, char *swapped) {
    44
    5   int i, nitems;
     5  off_t i, nitems;
    66  unsigned char *byte, *inbyte, *otbyte, tmp;
    77  CMF_PS1_V2 *output;
    … …  
    1313  // this function is a special case : it must have Nx = 136
    1414  if (ftable[0].header[0].Naxis[0] != 136) {
    15     fprintf (stderr, "ERROR: wrong format for CMF_PS1_V1_Alt: %d vs %d\n", ftable[0].header[0].Naxis[0], 136);
     15    fprintf (stderr, "ERROR: wrong format for CMF_PS1_V1_Alt: %lld vs %d\n", (long long) ftable[0].header[0].Naxis[0], 136);
    1616    exit (2);
    1717  }
    … …  
    8383
    8484  free (ftable[0].buffer);
    85   ftable[0].buffer = output;
     85  ftable[0].buffer = (char *) output;
    8686
    8787  // XXX other mods to make ftable consistent with CMF_PS1_V2? (Nx, EXTNAME?)

  • trunk/Ohana/src/libdvo/src/coordops.c

    r27025 r27435  
    307307  int i;
    308308  double Ro, Xo, Yo;
    309   double dX, dY, X, Y, Lo, Mo, dL, dM;
     309  double dX, dY, Lo, Mo, dL, dM;
    310310  double dLdX, dLdY, dMdX, dMdY, Do;
    311311

  • trunk/Ohana/src/libdvo/src/dvo_catalog.c

    r26398 r27435  
    141141  if (catalog[0].f == NULL)   return (DVO_CAT_OPEN_FAIL);
    142142
    143   fseek (catalog[0].f, 0, SEEK_SET);
     143  fseeko (catalog[0].f, 0, SEEK_SET);
    144144  return (DVO_CAT_OPEN_OK);
    145145}
    … …  
    253253  }
    254254  // check if the table has been sorted or not
    255   status = gfits_scan (&catalog[0].header, "SORTED", "%t", 1, &catalog[0].sorted);
     255  status = gfits_scan_alt (&catalog[0].header, "SORTED", "%t", 1, &catalog[0].sorted);
    256256  if (!status) catalog[0].sorted = TRUE;
    257257
    … …  
    302302
    303303  // set the 'sorted' header keyword
    304   gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     304  gfits_modify_alt (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    305305
    306306  // XXX handle return status
    … …  
    327327
    328328  // set the 'sorted' header keyword
    329   gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     329  gfits_modify_alt (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    330330
    331331  // XXX handle return status
    … …  
    353353  // set the 'sorted' header keyword
    354354  catalog[0].sorted = FALSE;
    355   gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     355  gfits_modify_alt (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    356356
    357357  /* update is only valid for catmode SPLIT */
    … …  
    376376int dvo_catalog_check (Catalog *catalog, int Nsecfilt, int extend) {
    377377
    378   int i, j, Nextra, in, out;
     378  off_t in, out, i;
     379  int j, Nextra;
    379380  SecFilt *insec, *outsec;
    380381
    … …  
    409410
    410411void dvo_catalog_free (Catalog *catalog) {
     412
     413  if (catalog[0].catmode == DVO_MODE_SPLIT) {
     414
     415    if (catalog[0].measure_catalog) {
     416      free (catalog[0].measure_catalog[0].filename);
     417      dvo_catalog_free (catalog[0].measure_catalog);
     418      free (catalog[0].measure_catalog);
     419    }
     420    if (catalog[0].missing_catalog) {
     421      free (catalog[0].missing_catalog[0].filename);
     422      dvo_catalog_free (catalog[0].missing_catalog);
     423      free (catalog[0].missing_catalog);
     424    }
     425    if (catalog[0].secfilt_catalog) {
     426      free (catalog[0].secfilt_catalog[0].filename);
     427      dvo_catalog_free (catalog[0].secfilt_catalog);
     428      free (catalog[0].secfilt_catalog);
     429    }
     430  }
    411431  dvo_catalog_free_data (catalog);
     432
    412433  gfits_free_header (&catalog[0].header);
    413434}
    … …  
    444465*/
    445466
    446 int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, int start, int Nrows) {
     467int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, off_t start, off_t Nrows) {
    447468
    448469  switch (catalog[0].catmode) {

  • trunk/Ohana/src/libdvo/src/dvo_catalog_create.c

    r20936 r27435  
    2727  }
    2828  gfits_create_header (&catalog[0].header);
    29  
     29
    3030  if (catalog[0].catmode == DVO_MODE_SPLIT) {
    3131    path = pathname (catalog[0].filename);
    … …  
    3939    /* create basic data for measure catalog file */
    4040    gfits_create_header (&catalog[0].measure_catalog[0].header);
     41
    4142    ALLOCATE (catalog[0].measure_catalog[0].filename, char, length);
     43
    4244    sprintf (catalog[0].measure_catalog[0].filename, "%s/%s.cpm", path, root);
    4345    file = filebasename (catalog[0].measure_catalog[0].filename);
    … …  
    8587      exit (2);
    8688    }
    87 
    8889  }   
    8990

  • trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

    r24755 r27435  
    33int dvo_catalog_load_mef (Catalog *catalog, int VERBOSE) {
    44 
    5   int Nitems, Nbytes, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt;
     5  int Nsecfilt;
     6  off_t Nitems, Nbytes, Nexpect, Naverage, Nmeasure, Nmissing;
    67  FILE *f;
    78
    … …  
    1516
    1617  /* move pointer past header -- must be already read (load_catalog) */
    17   fseek (f, catalog[0].header.size, SEEK_SET);
     18  fseeko (f, catalog[0].header.datasize, SEEK_SET);
    1819
    1920  /* matrix should be empty */
    … …  
    2324  }
    2425  /* get the components from the header */
    25   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%d", 1, &Naverage)) return (FALSE);
    26   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%d", 1, &Nmeasure)) return (FALSE);
    27   if (!gfits_scan (&catalog[0].header, "NMISS",    "%d", 1, &Nmissing)) return (FALSE);
    28   if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d", 1, &Nsecfilt)) Nsecfilt = 0;
     26  if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &Naverage)) return (FALSE);
     27  if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &Nmeasure)) return (FALSE);
     28  if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &Nmissing)) return (FALSE);
     29  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,              &Nsecfilt)) Nsecfilt = 0;
    2930
    3031  /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
    … …  
    7273    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
    7374    if (Naverage != catalog[0].Naves_disk) {
    74       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%d vs %d)\n", Naverage, catalog[0].Naves_disk);
     75      fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%lld vs %lld)\n", (long long) Naverage, (long long) catalog[0].Naves_disk);
    7576    }
    7677    catalog[0].Naverage = catalog[0].Naves_disk;
    … …  
    7879  } else {
    7980    Nbytes = gfits_data_size (&header);
    80     fseek (f, Nbytes, SEEK_CUR);
     81    fseeko (f, Nbytes, SEEK_CUR);
    8182    ALLOCATE (catalog[0].average, Average, 1);
    8283    catalog[0].Naverage = 0;
    … …  
    99100    catalog[0].measure = FtableToMeasure (&ftable, &catalog[0].Nmeasure, &catalog[0].catformat);
    100101    if (Nmeasure != catalog[0].Nmeas_disk) {
    101       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%d vs %d)\n", Nmeasure, catalog[0].Nmeas_disk);
     102      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%lld vs %lld)\n", (long long) Nmeasure, (long long) catalog[0].Nmeas_disk);
    102103    }
    103104    catalog[0].Nmeasure = catalog[0].Nmeas_disk;
    … …  
    105106  } else {
    106107    Nbytes = gfits_data_size (&header);
    107     fseek (f, Nbytes, SEEK_CUR);
     108    fseeko (f, Nbytes, SEEK_CUR);
    108109    ALLOCATE (catalog[0].measure, Measure, 1);
    109110    catalog[0].Nmeasure = 0;
    … …  
    125126    catalog[0].missing = gfits_table_get_Missing (&ftable, &catalog[0].Nmissing, NULL);
    126127    if (Nmissing != catalog[0].Nmiss_disk) {
    127       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%d vs %d)\n", Nmissing, catalog[0].Nmiss_disk);
     128      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%lld vs %lld)\n", (long long) Nmissing, (long long) catalog[0].Nmiss_disk);
    128129    }
    129130    catalog[0].Nmissing = catalog[0].Nmiss_disk;
    … …  
    131132  } else {
    132133    Nbytes = gfits_data_size (&header);
    133     fseek (f, Nbytes, SEEK_CUR);
     134    fseeko (f, Nbytes, SEEK_CUR);
    134135    ALLOCATE (catalog[0].missing, Missing, 1);
    135136    catalog[0].Nmissing = 0;
    … …  
    153154    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
    154155    if (Nexpect != Nitems) {
    155       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%d vs %d)\n", Nexpect, Nitems);
     156      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%lld vs %lld)\n", (long long) Nexpect, (long long) Nitems);
    156157    }
    157158
    … …  
    159160       we need to interleave these magnitudes with the secfilt entries just loaded */
    160161    if (primary != NULL) {
    161       int Ntmpfilt, Ntotal, i, j;
     162      off_t Ntmpfilt, Ntotal, i, j;
    162163      SecFilt *tmpfilt;
    163164      tmpfilt  = catalog[0].secfilt;
    … …  
    182183    /* no real need to skip the data array here... */
    183184    Nbytes = gfits_data_size (&header);
    184     fseek (f, Nbytes, SEEK_CUR);
     185    fseeko (f, Nbytes, SEEK_CUR);
    185186    if (primary != NULL) {
    186187      free (primary);
    … …  
    200201int dvo_catalog_save_mef (Catalog *catalog, char VERBOSE) {
    201202
    202   int Nitems;
     203  off_t Nitems;
    203204  FILE *f;
    204205  Matrix matrix;
    … …  
    207208  SecFilt *primary;
    208209  SecFilt *secfilt;
    209   int i, j, Nsecfilt, Nallfilt, Ntotal;
     210  off_t i, j, Nallfilt, Ntotal;
     211  int Nsecfilt;
    210212
    211213  if (catalog[0].Naverage == 0) {
    … …  
    236238
    237239  /* make sure header is consistent with data */
    238   gfits_modify (&catalog[0].header, "NSTARS",   "%d", 1, catalog[0].Naverage);
    239   gfits_modify (&catalog[0].header, "NMEAS",    "%d", 1, catalog[0].Nmeasure);
    240   gfits_modify (&catalog[0].header, "NMISS",    "%d", 1, catalog[0].Nmissing);
    241   gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
    242   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     240  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) catalog[0].Naverage);
     241  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) catalog[0].Nmeasure);
     242  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) catalog[0].Nmissing);
     243  gfits_modify (&catalog[0].header, "NSECFILT", "%d",   1,                        Nsecfilt);
     244  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    243245  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    244246
    245247  f = catalog[0].f;
    246248  /* rewind file pointers and truncate */
    247   fseek (f, 0, SEEK_SET);
     249  fseeko (f, 0LL, SEEK_SET);
    248250  ftruncate (fileno (catalog[0].f), 0);
    249251  ftable.header = &header;

  • trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r24748 r27435  
    55int dvo_catalog_load_raw (Catalog *catalog, int VERBOSE) {
    66 
    7   int Nitems, nitems;
    8   int i, Nmeas, Nmiss, size;
    9   int NewMeasure, Nskip;
    10   int AverageSize, MeasureSize, MissingSize, SecFiltSize;
     7  off_t Nitems, nitems;
     8  off_t i, Nmeas, Nmiss, size;
     9  off_t NewMeasure, Nskip;
     10  off_t AverageSize, MeasureSize, MissingSize, SecFiltSize;
    1111  FILE *f;
    1212  struct stat filestatus;
    … …  
    1717
    1818  /* move pointer past header -- must be already read (load_catalog) */
    19   fseek (f, catalog[0].header.size, SEEK_SET);
     19  fseeko (f, catalog[0].header.datasize, SEEK_SET);
    2020
    2121  /* get the components from the header */
    2222  catalog[0].Naverage = catalog[0].Nmeasure = catalog[0].Nmissing = catalog[0].Nsecfilt = 0;
    23   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%d", 1, &catalog[0].Naverage)) return (FALSE);
    24   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%d", 1, &catalog[0].Nmeasure)) return (FALSE);
    25   if (!gfits_scan (&catalog[0].header, "NMISS",    "%d", 1, &catalog[0].Nmissing)) return (FALSE);
    26   if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d", 1, &catalog[0].Nsecfilt)) catalog[0].Nsecfilt = 0;
     23  if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &catalog[0].Naverage)) return (FALSE);
     24  if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &catalog[0].Nmeasure)) return (FALSE);
     25  if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &catalog[0].Nmissing)) return (FALSE);
     26  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,              &catalog[0].Nsecfilt)) catalog[0].Nsecfilt = 0;
    2727
    2828  /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
    … …  
    4545  }
    4646  /* special cases: old versions of the DB tables which were poorly identified */
    47   if (gfits_scan (&catalog[0].header, "NEWMEAS",  "%t", 1, &NewMeasure)) {
     47  if (gfits_scan_alt (&catalog[0].header, "NEWMEAS",  "%t", 1, &NewMeasure)) {
    4848    catalog[0].catformat = DVO_FORMAT_ELIXIR; // special case for ELIXIR
    4949    goto got_format;
    … …  
    9898
    9999  /* predicted file size - for double checking data validity */
    100   size = catalog[0].header.size;
     100  size = catalog[0].header.datasize;
    101101  size += AverageSize * catalog[0].Naverage;
    102102  size += MeasureSize * catalog[0].Nmeasure;
    … …  
    112112    if (VERBOSE) {
    113113      fprintf (stderr, "star catalog has inconsistent size\n");
    114       fprintf (stderr, "average: %d = %d bytes\n", catalog[0].Naverage, catalog[0].Naverage*AverageSize);
    115       fprintf (stderr, "measure: %d = %d bytes\n", catalog[0].Nmeasure, catalog[0].Nmeasure*MeasureSize);
    116       fprintf (stderr, "missing: %d = %d bytes\n", catalog[0].Nmissing, catalog[0].Nmissing*MissingSize);
    117       fprintf (stderr, "secfilt: %d = %d bytes\n", catalog[0].Nsecfilt, catalog[0].Nsecfilt*SecFiltSize*catalog[0].Naverage);
    118       fprintf (stderr, "expect: %d, found: %d\n", size, (int)filestatus.st_size);
     114      fprintf (stderr, "average: %lld = %lld bytes\n", (long long) catalog[0].Naverage, (long long) catalog[0].Naverage*AverageSize);
     115      fprintf (stderr, "measure: %lld = %lld bytes\n", (long long) catalog[0].Nmeasure, (long long) catalog[0].Nmeasure*MeasureSize);
     116      fprintf (stderr, "missing: %lld = %lld bytes\n", (long long) catalog[0].Nmissing, (long long) catalog[0].Nmissing*MissingSize);
     117      fprintf (stderr, "secfilt: %lld = %lld bytes\n", (long long) catalog[0].Nsecfilt, (long long) catalog[0].Nsecfilt*SecFiltSize*catalog[0].Naverage);
     118      fprintf (stderr, "expect: %lld, found: %lld\n", (long long) size, (long long) filestatus.st_size);
    119119    }
    120120    return (FALSE);
    … …  
    136136    /* skip over averages */
    137137    Nskip = catalog[0].Naverage * AverageSize;
    138     fseek (f, Nskip, SEEK_CUR);
     138    fseeko (f, Nskip, SEEK_CUR);
    139139  }   
    140140 
    … …  
    145145    /* skip over measures */
    146146    Nskip = catalog[0].Nmeasure * MeasureSize;
    147     fseek (f, Nskip, SEEK_CUR);
     147    fseeko (f, Nskip, SEEK_CUR);
    148148  }   
    149149
    … …  
    154154    nitems = fread (catalog[0].missing, MissingSize, Nitems, f);
    155155    if (nitems != Nitems) {
    156       if (VERBOSE) fprintf (stderr, "failed to read missing from catalog file %s (%d vs %d)\n", catalog[0].filename, nitems, Nitems);
     156      if (VERBOSE) fprintf (stderr, "failed to read missing from catalog file %s (%lld vs %lld)\n", catalog[0].filename, (long long) nitems, (long long) Nitems);
    157157      return (FALSE);
    158158    }
    … …  
    161161    /* skip over missings */
    162162    Nskip = catalog[0].Nmissing * MissingSize;
    163     fseek (f, Nskip, SEEK_CUR);
     163    fseeko (f, Nskip, SEEK_CUR);
    164164  }
    165165 
    … …  
    172172       we need to interleave these magnitudes with the secfilt entries just loaded */
    173173    if (primary != NULL) {
    174       int Ntmpfilt, Nsecfilt, Ntotal, i, j;
     174      off_t Ntmpfilt, Nsecfilt, Ntotal, i, j;
    175175      SecFilt *tmpfilt;
    176176      tmpfilt  = catalog[0].secfilt;
    … …  
    193193    /* skip over secfilts */
    194194    Nskip = catalog[0].Nsecfilt * catalog[0].Naverage * SecFiltSize;
    195     fseek (f, Nskip, SEEK_CUR);
     195    fseeko (f, Nskip, SEEK_CUR);
    196196    if (primary != NULL) free (primary);
    197197  }
    198198
    199   if (VERBOSE) fprintf (stderr, "read %d stars from catalog file %s (%d measurements, %d missing, %d secondary filters)\n",
    200                         catalog[0].Naverage, catalog[0].filename, catalog[0].Nmeasure, catalog[0].Nmissing, catalog[0].Nsecfilt);
     199  if (VERBOSE) fprintf (stderr, "read %lld stars from catalog file %s (%lld measurements, %lld missing, %lld secondary filters)\n",
     200                        (long long) catalog[0].Naverage,
     201                        catalog[0].filename,
     202                        (long long) catalog[0].Nmeasure,
     203                        (long long) catalog[0].Nmissing,
     204                        (long long) catalog[0].Nsecfilt);
    201205
    202206  /* check data integrity */
    … …  
    209213      if (VERBOSE) {
    210214        fprintf (stderr, "****** data in catalog %s is corrupt, sums don't check\n", catalog[0].filename);
    211         fprintf (stderr, "****** Nmeas: %d, %d\n", Nmeas, catalog[0].Nmeasure);
    212         fprintf (stderr, "****** Nmiss: %d, %d\n", Nmiss, catalog[0].Nmissing);
     215        fprintf (stderr, "****** Nmeas: %lld, %lld\n", (long long) Nmeas, (long long) catalog[0].Nmeasure);
     216        fprintf (stderr, "****** Nmiss: %lld, %lld\n", (long long) Nmiss, (long long) catalog[0].Nmissing);
    213217      }
    214218      return (FALSE);
    … …  
    226230int dvo_catalog_save_raw (Catalog *catalog, char VERBOSE) {
    227231
    228   int Nitems, nitems;
     232  off_t Nitems, nitems;
    229233  FILE *f;
    230234  SecFilt *primary;
    231235  SecFilt *secfilt;
    232   int i, j, Nsecfilt, Nallfilt, Ntotal;
     236  off_t i, j, Nsecfilt, Nallfilt, Ntotal;
    233237
    234238  if (catalog[0].Naverage == 0) {
    … …  
    259263
    260264  /* make sure header is consistent with data */
    261   gfits_modify (&catalog[0].header, "NSTARS",   "%d", 1, catalog[0].Naverage);
    262   gfits_modify (&catalog[0].header, "NMEAS",    "%d", 1, catalog[0].Nmeasure);
    263   gfits_modify (&catalog[0].header, "NMISS",    "%d", 1, catalog[0].Nmissing);
    264   gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, catalog[0].Nsecfilt);
     265  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) catalog[0].Naverage);
     266  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) catalog[0].Nmeasure);
     267  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) catalog[0].Nmissing);
     268  gfits_modify (&catalog[0].header, "NSECFILT", "%lld", 1, (long long) catalog[0].Nsecfilt);
    265269  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    266270
    … …  
    278282  /* rewind file pointers and truncate file */
    279283  f = catalog[0].f;
    280   fseek (f, 0, SEEK_SET);
     284  fseeko (f, 0, SEEK_SET);
    281285  ftruncate (fileno (catalog[0].f), 0);
    282286
    283287  /* write header data (use gfits_write_header?) */
    284   nitems = fwrite (catalog[0].header.buffer, 1, catalog[0].header.size, f);
    285   if (nitems != catalog[0].header.size) {
     288  nitems = fwrite (catalog[0].header.buffer, 1, catalog[0].header.datasize, f);
     289  if (nitems != catalog[0].header.datasize) {
    286290    if (VERBOSE) fprintf (stderr, "failed to write header\n");
    287291    goto failure;
    … …  
    330334   in these cases, save these values in primary; otherwise set primary to NULL */
    331335
    332 Average *ReadRawAverage (FILE *f, int Naverage, int format, SecFilt **primary) {
     336Average *ReadRawAverage (FILE *f, off_t Naverage, char format, SecFilt **primary) {
    333337
    334338  Average *average;
    … …  
    339343# define FORMAT_CASE(NAME,TYPE) \
    340344    case DVO_FORMAT_##NAME: { \
    341       int nitems; \
     345      off_t nitems; \
    342346      Average_##TYPE *tmpAverage; \
    343347      ALLOCATE (tmpAverage, Average_##TYPE, MAX (Naverage, 1)); \
    344348      nitems = fread (tmpAverage, sizeof(Average_##TYPE), Naverage, f); \
    345349      if (nitems != Naverage) { \
    346         fprintf (stderr, "failed to read averages (%d vs %d)\n", nitems, Naverage); \
     350        fprintf (stderr, "failed to read averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage); \
    347351        return (NULL); \
    348352      } \
    … …  
    354358  switch (format) {
    355359    case DVO_FORMAT_INTERNAL: {
    356       int nitems;
     360      off_t nitems;
    357361      ALLOCATE (average, Average, MAX (Naverage, 1));
    358362      nitems = fread (average, sizeof(Average), Naverage, f);
    359363      if (nitems != Naverage) {
    360         fprintf (stderr, "failed to read averages (%d vs %d)\n", nitems, Naverage);
     364        fprintf (stderr, "failed to read averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage);
    361365        return (NULL);
    362366      }
    … …  
    384388/* accepts and converts internal average formats and outputs
    385389   raw data in the specified format */
    386 int WriteRawAverage (FILE *f, Average *average, int Naverage, int format, SecFilt *primary) {
     390int WriteRawAverage (FILE *f, Average *average, off_t Naverage, char format, SecFilt *primary) {
    387391
    388392// this macro generates the case statements for each type
    389393# define FORMAT_CASE(NAME,TYPE) \
    390394    case DVO_FORMAT_##NAME: { \
    391       int nitems; \
     395      off_t nitems; \
    392396      Average_##TYPE *tmpAverage; \
    393397      tmpAverage = AverageInternalTo_##TYPE (average, Naverage, primary); \
    … …  
    396400      free (tmpAverage); \
    397401      if (nitems != Naverage) { \
    398         fprintf (stderr, "failed to write averages (%d vs %d)\n", nitems, Naverage); \
     402        fprintf (stderr, "failed to write averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage); \
    399403        return (FALSE); \
    400404      } \
    … …  
    403407  switch (format) {
    404408    case DVO_FORMAT_INTERNAL: {
    405       int nitems;
     409      off_t nitems;
    406410      gfits_convert_Average (average, sizeof(Average), Naverage);
    407411      nitems = fwrite (average, sizeof(Average), Naverage, f);
    408412      if (nitems != Naverage) {
    409         fprintf (stderr, "failed to write averages (%d vs %d)\n", nitems, Naverage);
     413        fprintf (stderr, "failed to write averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage);
    410414        return (FALSE);
    411415      }
    … …  
    432436/** Average / Raw Table conversions **/
    433437
    434 Measure *ReadRawMeasure (FILE *f, int Nmeasure, int format) {
     438Measure *ReadRawMeasure (FILE *f, off_t Nmeasure, char format) {
    435439
    436440  Measure *measure;
    … …  
    439443# define FORMAT_CASE(NAME,TYPE) \
    440444    case DVO_FORMAT_##NAME: { \
    441       int nitems; \
     445      off_t nitems; \
    442446      Measure_##TYPE *tmpMeasure; \
    443447      ALLOCATE (tmpMeasure, Measure_##TYPE, MAX (Nmeasure, 1)); \
    444448      nitems = fread (tmpMeasure, sizeof(Measure_##TYPE), Nmeasure, f); \
    445449      if (nitems != Nmeasure) { \
    446         fprintf (stderr, "failed to read measures (%d vs %d)\n", nitems, Nmeasure); \
     450        fprintf (stderr, "failed to read measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure); \
    447451        return (NULL); \
    448452      } \
    … …  
    454458  switch (format) {
    455459    case DVO_FORMAT_INTERNAL: {
    456       int nitems;
     460      off_t nitems;
    457461      ALLOCATE (measure, Measure, MAX (Nmeasure, 1));
    458462      nitems = fread (measure, sizeof(Measure), Nmeasure, f);
    459463      if (nitems != Nmeasure) {
    460         fprintf (stderr, "failed to read measures (%d vs %d)\n", nitems, Nmeasure);
     464        fprintf (stderr, "failed to read measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure);
    461465        return (NULL);
    462466      }
    … …  
    484488/* accepts and converts internal measure formats and outputs
    485489   raw data in the specified format */
    486 int WriteRawMeasure (FILE *f, Measure *measure, int Nmeasure, int format) {
     490int WriteRawMeasure (FILE *f, Measure *measure, off_t Nmeasure, char format) {
    487491
    488492// this macro generates the case statements for each type
    489493# define FORMAT_CASE(NAME,TYPE) \
    490494    case DVO_FORMAT_##NAME: { \
    491       int nitems; \
     495      off_t nitems; \
    492496      Measure_##TYPE *tmpMeasure; \
    493497      tmpMeasure = MeasureInternalTo_##TYPE (measure, Nmeasure); \
    … …  
    496500      free (tmpMeasure); \
    497501      if (nitems != Nmeasure) { \
    498         fprintf (stderr, "failed to write measures (%d vs %d)\n", nitems, Nmeasure); \
     502        fprintf (stderr, "failed to write measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure); \
    499503        return (FALSE); \
    500504      } \
    … …  
    503507  switch (format) {
    504508    case DVO_FORMAT_INTERNAL: {
    505       int nitems;
     509      off_t nitems;
    506510      gfits_convert_Measure (measure, sizeof(Measure), Nmeasure);
    507511      nitems = fwrite (measure, sizeof(Measure), Nmeasure, f);
    508512      if (nitems != Nmeasure) {
    509         fprintf (stderr, "failed to write measures (%d vs %d)\n", nitems, Nmeasure);
     513        fprintf (stderr, "failed to write measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure);
    510514        return (FALSE);
    511515      }
    … …  
    532536/** SecFilt / Raw Table conversions **/
    533537
    534 SecFilt *ReadRawSecFilt (FILE *f, int Nsecfilt, int format) {
     538SecFilt *ReadRawSecFilt (FILE *f, off_t Nsecfilt, char format) {
    535539
    536540  SecFilt *secfilt;
    … …  
    539543# define FORMAT_CASE(NAME,TYPE) \
    540544    case DVO_FORMAT_##NAME: { \
    541       int nitems; \
     545      off_t nitems; \
    542546      SecFilt_##TYPE *tmpSecFilt; \
    543547      ALLOCATE (tmpSecFilt, SecFilt_##TYPE, MAX (Nsecfilt, 1)); \
    544548      nitems = fread (tmpSecFilt, sizeof(SecFilt_##TYPE), Nsecfilt, f); \
    545549      if (nitems != Nsecfilt) { \
    546         fprintf (stderr, "failed to read secfilts (%d vs %d)\n", nitems, Nsecfilt); \
     550        fprintf (stderr, "failed to read secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt); \
    547551        return (NULL); \
    548552      } \
    … …  
    554558  switch (format) {
    555559    case DVO_FORMAT_INTERNAL: {
    556       int nitems;
     560      off_t nitems;
    557561      ALLOCATE (secfilt, SecFilt, MAX (Nsecfilt, 1));
    558562      nitems = fread (secfilt, sizeof(SecFilt), Nsecfilt, f);
    559563      if (nitems != Nsecfilt) {
    560         fprintf (stderr, "failed to read secfilts (%d vs %d)\n", nitems, Nsecfilt);
     564        fprintf (stderr, "failed to read secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt);
    561565        return (NULL);
    562566      }
    … …  
    584588/* accepts and converts internal secfilt formats and outputs
    585589   raw data in the specified format */
    586 int WriteRawSecFilt (FILE *f, SecFilt *secfilt, int Nsecfilt, int format) {
     590int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format) {
    587591
    588592// this macro generates the case statements for each type
    589593# define FORMAT_CASE(NAME,TYPE) \
    590594    case DVO_FORMAT_##NAME: { \
    591       int nitems; \
     595      off_t nitems; \
    592596      SecFilt_##TYPE *tmpSecFilt; \
    593597      tmpSecFilt = SecFiltInternalTo_##TYPE (secfilt, Nsecfilt); \
    … …  
    596600      free (tmpSecFilt); \
    597601      if (nitems != Nsecfilt) { \
    598         fprintf (stderr, "failed to write secfilts (%d vs %d)\n", nitems, Nsecfilt); \
     602        fprintf (stderr, "failed to write secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt); \
    599603        return (FALSE); \
    600604      } \
    … …  
    603607  switch (format) {
    604608    case DVO_FORMAT_INTERNAL: {
    605       int nitems;
     609      off_t nitems;
    606610      gfits_convert_SecFilt (secfilt, sizeof(SecFilt), Nsecfilt);
    607611      nitems = fwrite (secfilt, sizeof(SecFilt), Nsecfilt, f);
    608612      if (nitems != Nsecfilt) {
    609         fprintf (stderr, "failed to write secfilts (%d vs %d)\n", nitems, Nsecfilt);
     613        fprintf (stderr, "failed to write secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt);
    610614        return (FALSE);
    611615      }

  • trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

    r20982 r27435  
    88int dvo_catalog_secfilt_to_primary (Catalog *catalog, SecFilt **myPrimary, SecFilt **mySecfilt, int *myNsecfilt) {
    99
    10   int i, j, Nallfilt, Nsecfilt, Ntotal;
     10  off_t i, j, Nallfilt, Nsecfilt, Ntotal;
    1111
    1212  SecFilt *primary;
    … …  
    4343}
    4444
    45 int dvo_catalog_primary_to_secfilt (Catalog *catalog, SecFilt *primary, int Naves) {
    46 
    47   int Ntmpfilt, Nsecfilt, Ntotal, i, j;
     45int dvo_catalog_primary_to_secfilt (Catalog *catalog, SecFilt *primary, off_t Naves) {
     46
     47  off_t Ntmpfilt, Nsecfilt, Ntotal, i, j;
    4848  SecFilt *tmpfilt;
    4949
    … …  
    7171}
    7272
    73 int dvo_catalog_save_subcat (Catalog *catalog, FTable *ftable, int start, int Nrows, int Ndisk, int Ntotal) {
     73int dvo_catalog_save_subcat (Catalog *catalog, FTable *ftable, off_t start, off_t Nrows, off_t Ndisk, off_t Ntotal) {
    7474
    7575  Matrix matrix;
    7676
    7777  /* rewind file pointers and truncate (file is still open) */
    78   fseek (catalog->f, 0, SEEK_SET);
     78  fseeko (catalog->f, 0LL, SEEK_SET);
    7979
    8080  // write PHU header
    … …  
    103103int dvo_catalog_open_subcat (Catalog *catalog, Catalog **Subcat, Header *header, char *name, int VERBOSE) {
    104104
    105   int Nskip, status;
     105  off_t Nskip;
     106  int status;
    106107  char *path, string[80];
    107108  Catalog *subcat;
    … …  
    145146  }
    146147  Nskip = gfits_data_size (&subcat[0].header);
    147   fseek (subcat[0].f, Nskip, SEEK_CUR);
     148  fseeko (subcat[0].f, Nskip, SEEK_CUR);
    148149
    149150  /* read Measure table header */
    … …  
    158159int dvo_catalog_load_split (Catalog *catalog, int VERBOSE) {
    159160
    160   int Nbytes, Nitems, Naverage, Nmeasure, Nmissing, Nsecfilt, status;
     161  off_t Nbytes;
     162  off_t Naverage, Nmeasure, Nmissing;
     163  off_t Nitems;
     164  int status, Nsecfilt;
    161165  Header header;
    162166  FTable ftable;
    … …  
    170174
    171175  /* get the components from the header - these duplicate information in the split files (NAXIS2) */
    172   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%d", 1, &Naverage)) return (FALSE);
    173   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%d", 1, &Nmeasure)) return (FALSE);
    174   if (!gfits_scan (&catalog[0].header, "NMISS",    "%d", 1, &Nmissing)) return (FALSE);
    175   if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d", 1, &Nsecfilt)) Nsecfilt = 0;
     176  if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &Naverage)) return (FALSE);
     177  if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &Nmeasure)) return (FALSE);
     178  if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &Nmissing)) return (FALSE);
     179  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,              &Nsecfilt)) Nsecfilt = 0;
    176180
    177181  /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
    178182     it is not defined for a legacy database, we can generate them using the existing index values.
    179183     If it is missing, give a warning and recommend the user upgrade the DB */
    180   if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) {
     184  if (!gfits_scan (&catalog[0].header, "OBJID",    "%u", 1, &catalog[0].objID)) {
    181185    if (VERBOSE) fprintf (stderr, "WARNING: OBJID is not set for this database: upgrade for full feature set\n");
    182186    catalog[0].objID = 0;
    183187  }
    184   if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) {
     188  if (!gfits_scan (&catalog[0].header, "CATID",    "%u", 1, &catalog[0].catID)) {
    185189    if (VERBOSE) fprintf (stderr, "WARNING: CATID is not set for this database: upgrade for full feature set\n");
    186190    catalog[0].catID = 0;
    … …  
    206210  if (catalog[0].catflags & LOAD_AVES) {
    207211    /* move pointer past header -- must be already read (load_catalog) */
    208     Nbytes = catalog[0].header.size + gfits_data_size (&catalog[0].header);
    209     fseek (catalog[0].f, Nbytes, SEEK_SET);
     212    Nbytes = catalog[0].header.datasize + gfits_data_size (&catalog[0].header);
     213    fseeko (catalog[0].f, Nbytes, SEEK_SET);
    210214    /* read Average table header */
    211215    if (!gfits_fread_header (catalog[0].f, &header)) {
    … …  
    223227    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
    224228    if (Naverage != catalog[0].Naves_disk) {
    225       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%d vs %d)\n", Naverage, catalog[0].Naves_disk);
     229      fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%lld vs %lld)\n", (long long) Naverage, (long long) catalog[0].Naves_disk);
    226230    }
    227231    gfits_free_header (&header);
    … …  
    252256    catalog[0].measure = FtableToMeasure (&ftable, &Nmeasure, &catalog[0].catformat);
    253257    if (Nmeasure != catalog[0].Nmeas_disk) {
    254       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%d vs %d)\n", Nmeasure, catalog[0].Nmeas_disk);
     258      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%lld vs %lld)\n", (long long) Nmeasure, (long long) catalog[0].Nmeas_disk);
    255259    }
    256260    catalog[0].Nmeasure = catalog[0].Nmeas_disk;
    … …  
    282286    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
    283287    if (Nmissing != catalog[0].Nmiss_disk) {
    284       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%d vs %d)\n", Nmissing, catalog[0].Nmiss_disk);
     288      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%lld vs %lld)\n", (long long) Nmissing, (long long) catalog[0].Nmiss_disk);
    285289    }
    286290    catalog[0].Nmissing = catalog[0].Nmiss_disk;
    … …  
    311315    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
    312316    if (Nitems != catalog[0].Nsecf_disk) {
    313       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%d vs %d)\n", Nitems, catalog[0].Nsecf_disk);
     317      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%lld vs %lld)\n", (long long) Nitems, (long long) catalog[0].Nsecf_disk);
    314318    }
    315319    catalog[0].Nsecf_mem = catalog[0].Nsecf_disk;
    … …  
    339343// I need to always read both average and secfilt at the same time to correctly manage the
    340344// primary secfilt values...
    341 int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, int start, int Nrows) {
    342 
    343   int Nbytes, Naverage, Nexpect, Nitems, Nmeasure, Nmissing;
     345int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, off_t start, off_t Nrows) {
     346
     347  off_t Nbytes;
     348  off_t Naverage, Nexpect, Nitems, Nmeasure, Nmissing;
    344349  Header header;
    345350  FTable ftable;
    … …  
    357362    /*** load the Average data ***/
    358363    /* move pointer past header and matrix -- must be already read (load_catalog) */
    359     Nbytes = catalog[0].header.size + gfits_data_size (&catalog[0].header);
    360     fseek (catalog[0].f, Nbytes, SEEK_SET);
     364    Nbytes = catalog[0].header.datasize + gfits_data_size (&catalog[0].header);
     365    fseeko (catalog[0].f, Nbytes, SEEK_SET);
    361366    /* read Average table header */
    362367    if (!gfits_fread_header (catalog[0].f, &header)) {
    … …  
    386391
    387392    /* move pointer past header -- must be already read (load_catalog) */
    388     Nbytes = subcat[0].header.size + gfits_data_size (&subcat[0].header);
    389     fseek (subcat[0].f, Nbytes, SEEK_SET);
     393    Nbytes = subcat[0].header.datasize + gfits_data_size (&subcat[0].header);
     394    fseeko (subcat[0].f, Nbytes, SEEK_SET);
    390395
    391396    /* read Secfilt table header */
    … …  
    403408    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
    404409    if (Nitems != Nexpect) {
    405       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%d vs %d)\n", Nitems, Nexpect);
     410      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%lld vs %lld)\n", (long long) Nitems, (long long) Nexpect);
    406411    }
    407412    catalog[0].Nsecf_mem = catalog[0].Naverage * catalog[0].Nsecfilt;
    … …  
    422427
    423428    /* move pointer past header -- must be already read (load_catalog) */
    424     Nbytes = subcat[0].header.size + gfits_data_size (&subcat[0].header);
    425     fseek (subcat[0].f, Nbytes, SEEK_SET);
     429    Nbytes = subcat[0].header.datasize + gfits_data_size (&subcat[0].header);
     430    fseeko (subcat[0].f, Nbytes, SEEK_SET);
    426431
    427432    /* read Measure table header */
    … …  
    439444    catalog[0].measure = FtableToMeasure (&ftable, &Nmeasure, &catalog[0].catformat);
    440445    if (Nmeasure != Nrows) {
    441       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%d vs %d)\n", Nmeasure, Nrows);
     446      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%lld vs %lld)\n", (long long) Nmeasure, (long long) Nrows);
    442447    }
    443448    gfits_free_header (&header);
    … …  
    452457
    453458    /* move pointer past header -- must be already read (load_catalog) */
    454     Nbytes = subcat[0].header.size + gfits_data_size (&subcat[0].header);
    455     fseek (subcat[0].f, Nbytes, SEEK_SET);
     459    Nbytes = subcat[0].header.datasize + gfits_data_size (&subcat[0].header);
     460    fseeko (subcat[0].f, Nbytes, SEEK_SET);
    456461
    457462    /* read Missing table header */
    … …  
    469474    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
    470475    if (Nmissing != Nrows) {
    471       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%d vs %d)\n", Nmissing, Nrows);
     476      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%lld vs %lld)\n", (long long) Nmissing, (long long) Nrows);
    472477    }
    473478    gfits_free_header (&header);
    … …  
    481486int dvo_catalog_save_split (Catalog *catalog, char VERBOSE) {
    482487
    483   int Nitems;
     488  off_t Nitems;
    484489  Header header;
    485490  FTable ftable;
    486491  SecFilt *primary, *secfilt;
    487492  int Nsecfilt;
    488   int Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
    489   int first, start, Nrows;
     493  off_t Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
     494  off_t first, start, Nrows;
    490495
    491496  ftable.header = &header;
    … …  
    519524
    520525  /* make sure header is consistent with data */
    521   gfits_modify (&catalog[0].header, "NSTARS",   "%d", 1, Naves_disk_new);
    522   gfits_modify (&catalog[0].header, "NMEAS",    "%d", 1, Nmeas_disk_new);
    523   gfits_modify (&catalog[0].header, "NMISS",    "%d", 1, Nmiss_disk_new);
    524   gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
    525   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     526  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
     527  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
     528  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     529  gfits_modify (&catalog[0].header, "NSECFILT", "%d",   1, Nsecfilt);
     530  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    526531  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    527532
    … …  
    555560    // even if we do not save the average table, we need to keep the header in sync
    556561    /* rewind file pointers and truncate (file is still open) */
    557     fseek (catalog[0].f, 0, SEEK_SET);
     562    fseeko (catalog[0].f, 0, SEEK_SET);
    558563
    559564    /* write table PHU header - always write this out */
    … …  
    662667int dvo_catalog_save_split_complete (Catalog *catalog, char VERBOSE) {
    663668
    664   int Nitems;
     669  off_t Nitems;
    665670  Header header;
    666671  FTable ftable;
    667672  SecFilt *primary, *secfilt;
    668673  int Nsecfilt;
    669   int Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
    670   int first, start, Nrows;
     674  off_t Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
     675  off_t first, start, Nrows;
    671676
    672677  ftable.header = &header;
    … …  
    693698  }
    694699
    695   if ((catalog[0].Naverage > 0) && (Naves_disk_new == 0)) {
    696     Naves_disk_new = catalog[0].Naverage;
     700  Naves_disk_new = catalog[0].Naverage;
     701  if (Naves_disk_new == 0) {
    697702    if (VERBOSE) fprintf (stderr, "resulting catalog is empty; delete it\n");
    698703    // unlink ();
    699704    return (TRUE);
    700705  }
    701 
    702   Naves_disk_new = catalog[0].Naverage;
    703706
    704707  // for the appropriate types, pull out the first secfilt and pass to AverageToFtable as primary
    … …  
    720723
    721724  /* make sure header is consistent with data */
    722   gfits_modify (&catalog[0].header, "NSTARS",   "%d", 1, Naves_disk_new);
    723   gfits_modify (&catalog[0].header, "NMEAS",    "%d", 1, Nmeas_disk_new);
    724   gfits_modify (&catalog[0].header, "NMISS",    "%d", 1, Nmiss_disk_new);
     725  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
     726  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
     727  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
    725728  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
    726   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     729  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    727730  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    728731
    … …  
    756759    // even if we do not save the average table, we need to keep the header in sync
    757760    /* rewind file pointers and truncate (file is still open) */
    758     fseek (catalog[0].f, 0, SEEK_SET);
     761    fseeko (catalog[0].f, 0, SEEK_SET);
    759762
    760763    /* write table PHU header - always write this out */
    … …  
    867870  SecFilt *primary, *secfilt;
    868871  int Nsecfilt;
    869   int Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
    870   int first, start, Nrows;
     872  off_t Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
     873  off_t first, start, Nrows;
    871874
    872875  ftable.header = &header;
    … …  
    899902
    900903  /* make sure header is consistent with data */
    901   gfits_modify (&catalog[0].header, "NSTARS",   "%d", 1, Naves_disk_new);
    902   gfits_modify (&catalog[0].header, "NMEAS",    "%d", 1, Nmeas_disk_new);
    903   gfits_modify (&catalog[0].header, "NMISS",    "%d", 1, Nmiss_disk_new);
     904  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
     905  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
     906  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
    904907  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
    905   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     908  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    906909  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    907910
    … …  
    935938    // even if we do not save the average table, we need to keep the header in sync
    936939    /* rewind file pointers and truncate (file is still open) */
    937     fseek (catalog[0].f, 0, SEEK_SET);
     940    fseeko (catalog[0].f, 0, SEEK_SET);
    938941
    939942    /* write table PHU header - always write this out */

  • trunk/Ohana/src/libdvo/src/dvo_convert.c

    r24748 r27435  
    1313/*** Average / FTable conversion functions ***/
    1414
    15 Average *FtableToAverage (FTable *ftable, int *Naverage, int *format, SecFilt **primary) {
     15Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary) {
    1616
    1717  Average *average;
    … …  
    5959}
    6060
    61 int AverageToFtable (FTable *ftable, Average *average, int Naverage, int format, SecFilt *primary) {
     61int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary) {
    6262
    6363# define FORMAT_CASE(FORMAT, TYPE) \
    … …  
    9494/*** Measure / FTable conversion functions ***/
    9595
    96 Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format) {
     96Measure *FtableToMeasure (FTable *ftable, off_t *Nmeasure, char *format) {
    9797
    9898  Measure *measure;
    … …  
    136136}
    137137
    138 int MeasureToFtable (FTable *ftable, Measure *measure, int Nmeasure, int format) {
     138int MeasureToFtable (FTable *ftable, Measure *measure, off_t Nmeasure, char format) {
    139139
    140140# define FORMAT_CASE(FORMAT, TYPE) \
    … …  
    171171/*** SecFilt / FTable conversion functions ***/
    172172
    173 SecFilt *FtableToSecFilt (FTable *ftable, int *Nsecfilt, int *format) {
     173SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format) {
    174174
    175175  SecFilt *secfilt;
    … …  
    213213}
    214214
    215 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format) {
     215int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format) {
    216216
    217217# define FORMAT_CASE(FORMAT, TYPE) \
    … …  
    248248/*** Image Conversions ***/
    249249
    250 int FtableToImage (FTable *ftable, Header *theader, int *format) {
    251 
    252   int Nimage;
     250int FtableToImage (FTable *ftable, Header *theader, char *format) {
     251
     252  off_t Nimage;
    253253  char extname[80];
    254254
    … …  
    261261    gfits_free_header (theader);
    262262    gfits_table_mkheader_Image (theader);
    263     gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     263    gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage);
    264264    theader[0].Naxis[1] = Nimage;
    265     ftable[0].size = gfits_data_size (theader);
     265    ftable[0].datasize = gfits_data_size (theader);
    266266    return (TRUE);
    267267  }
    … …  
    282282    gfits_free_header (theader); \
    283283    gfits_table_mkheader_Image (theader); \
    284     gfits_modify (theader, "NAXIS2", "%d", 1, Nimage); \
     284    gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage); \
    285285    theader[0].Naxis[1] = Nimage; \
    286     ftable[0].size = gfits_data_size (theader); \
     286    ftable[0].datasize = gfits_data_size (theader); \
    287287    return (TRUE); }
    288288
    … …  
    312312}
    313313
    314 int ImageToFtable (FTable *ftable, Header *theader, int format) {
    315 
    316   int Nimage;
     314int ImageToFtable (FTable *ftable, Header *theader, char format) {
     315
     316  off_t Nimage;
    317317
    318318  Nimage = theader[0].Naxis[1];
    … …  
    353353}
    354354
    355 int ImageToVtable (VTable *vtable, Header *theader, int format) {
    356 
    357   int i, Nrow, Nimage;
     355int ImageToVtable (VTable *vtable, Header *theader, char format) {
     356
     357  off_t i, Nrow, Nimage;
    358358
    359359  Nrow = vtable[0].Nrow;
    … …  
    370370      } \
    371371      /* convert header from old format to new format */ \
    372       gfits_scan (theader, "NAXIS2", "%d", 1, &Nimage); \
     372      gfits_scan (theader, "NAXIS2", "%lld", 1, (long long *) &Nimage); \
    373373      gfits_free_header (theader); \
    374374      gfits_table_mkheader_Image_##TYPE (theader); \
    375       gfits_modify (theader, "NAXIS2", "%d", 1, Nimage); \
     375      gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage); \
    376376      theader[0].Naxis[1] = Nimage; \
    377       vtable[0].size = gfits_data_size (theader); \
     377      vtable[0].datasize = gfits_data_size (theader); \
    378378      return (TRUE); }
    379379

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r21508 r27435  
    33/* convert PS1_DEV_1 formats to internal formats */
    44
    5 Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, int Nvalues) {
    6 
    7   int i;
     5Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, off_t Nvalues) {
     6
     7  off_t i;
    88  Measure *out;
    99
    … …  
    6161}
    6262
    63 Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, int Nvalues) {
    64 
    65   int i;
     63Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, off_t Nvalues) {
     64
     65  off_t i;
    6666  Measure_PS1_DEV_1 *out;
    6767
    … …  
    108108
    109109// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    110 Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, int Nvalues, SecFilt **primary) {
    111 
    112   int i;
     110Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, off_t Nvalues, SecFilt **primary) {
     111
     112  off_t i;
    113113  Average *out;
    114114
    … …  
    148148
    149149// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    150 Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, int Nvalues, SecFilt *primary) {
    151 
    152   int i;
     150Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary) {
     151
     152  off_t i;
    153153  Average_PS1_DEV_1 *out;
    154154
    … …  
    182182}
    183183
    184 SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, int Nvalues) {
    185 
    186   int i;
     184SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, off_t Nvalues) {
     185
     186  off_t i;
    187187  SecFilt *out;
    188188
    … …  
    203203}
    204204
    205 SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, int Nvalues) {
    206 
    207   int i;
     205SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, off_t Nvalues) {
     206
     207  off_t i;
    208208  SecFilt_PS1_DEV_1 *out;
    209209
    … …  
    220220}
    221221
    222 Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, int Nvalues) {
    223 
    224   int i;
     222Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues) {
     223
     224  off_t i;
    225225  Image *out;
    226226
    … …  
    284284
    285285/* convert internal images to panstarrs-format images */
    286 Image_PS1_DEV_1 *ImageInternalTo_PS1_DEV_1 (Image *in, int Nvalues) {
    287 
    288   int i;
     286Image_PS1_DEV_1 *ImageInternalTo_PS1_DEV_1 (Image *in, off_t Nvalues) {
     287
     288  off_t i;
    289289  Image_PS1_DEV_1 *out;
    290290
    … …  
    342342}
    343343
    344 PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, int Nvalues) {
    345 
    346   int i;
     344PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, off_t Nvalues) {
     345
     346  off_t i;
    347347  PhotCode *out;
    348348
    … …  
    381381}
    382382
    383 PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, int Nvalues) {
    384 
    385   int i;
     383PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, off_t Nvalues) {
     384
     385  off_t i;
    386386  PhotCode_PS1_DEV_1 *out;
    387387

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r21508 r27435  
    33/* convert PS1_DEV_2 formats to internal formats */
    44
    5 Measure *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, int Nvalues) {
    6 
    7   int i;
     5Measure *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, off_t Nvalues) {
     6
     7  off_t i;
    88  Measure *out;
    99
    … …  
    5858}
    5959
    60 Measure_PS1_DEV_2 *MeasureInternalTo_PS1_DEV_2 (Measure *in, int Nvalues) {
    61 
    62   int i;
     60Measure_PS1_DEV_2 *MeasureInternalTo_PS1_DEV_2 (Measure *in, off_t Nvalues) {
     61
     62  off_t i;
    6363  Measure_PS1_DEV_2 *out;
    6464
    … …  
    104104
    105105// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    106 Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, int Nvalues, SecFilt **primary) {
    107 
    108   int i;
     106Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, off_t Nvalues, SecFilt **primary) {
     107
     108  off_t i;
    109109  Average *out;
    110110
    … …  
    142142
    143143// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    144 Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, int Nvalues, SecFilt *primary) {
    145 
    146   int i;
     144Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, off_t Nvalues, SecFilt *primary) {
     145
     146  off_t i;
    147147  Average_PS1_DEV_2 *out;
    148148
    … …  
    176176}
    177177
    178 SecFilt *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, int Nvalues) {
    179 
    180   int i;
     178SecFilt *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, off_t Nvalues) {
     179
     180  off_t i;
    181181  SecFilt *out;
    182182
    … …  
    197197}
    198198
    199 SecFilt_PS1_DEV_2 *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, int Nvalues) {
    200 
    201   int i;
     199SecFilt_PS1_DEV_2 *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, off_t Nvalues) {
     200
     201  off_t i;
    202202  SecFilt_PS1_DEV_2 *out;
    203203
    … …  
    214214}
    215215
    216 Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, int Nvalues) {
    217 
    218   int i;
     216Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues) {
     217
     218  off_t i;
    219219  Image *out;
    220220
    … …  
    224224    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    225225
    226     strncpy (out[i].name, in[i].name, 63); // out[121], int[64]
     226    strncpy (out[i].name, in[i].name, 63); // out[121], in[64]
    227227    out[i].name[63] = 0; // force termination
    228228
    … …  
    275275}
    276276
    277 Image_PS1_DEV_2 *ImageInternalTo_PS1_DEV_2 (Image *in, int Nvalues) {
    278 
    279   int i;
     277Image_PS1_DEV_2 *ImageInternalTo_PS1_DEV_2 (Image *in, off_t Nvalues) {
     278
     279  off_t i;
    280280  Image_PS1_DEV_2 *out;
    281281
    … …  
    335335}
    336336
    337 PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, int Nvalues) {
    338 
    339   int i;
     337PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, off_t Nvalues) {
     338
     339  off_t i;
    340340  PhotCode *out;
    341341
    … …  
    372372}
    373373
    374 PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, int Nvalues) {
    375 
    376   int i;
     374PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, off_t Nvalues) {
     375
     376  off_t i;
    377377  PhotCode_PS1_DEV_2 *out;
    378378

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c

    r21508 r27435  
    55// We only provide image and photcode conversion
    66
    7 Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, int Nvalues) {
     7Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues) {
    88
    9   int i;
     9  off_t i;
    1010  Image *out;
    1111
    … …  
    6666}
    6767
    68 Image_PS1_DEV_3 *ImageInternalTo_PS1_DEV_3 (Image *in, int Nvalues) {
     68Image_PS1_DEV_3 *ImageInternalTo_PS1_DEV_3 (Image *in, off_t Nvalues) {
    6969
    70   int i;
     70  off_t i;
    7171  Image_PS1_DEV_3 *out;
    7272
    … …  
    126126}
    127127
    128 PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, int Nvalues) {
     128PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, off_t Nvalues) {
    129129
    130   int i;
     130  off_t i;
    131131  PhotCode *out;
    132132
    … …  
    162162}
    163163
    164 PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, int Nvalues) {
     164PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, off_t Nvalues) {
    165165
    166   int i;
     166  off_t i;
    167167  PhotCode_PS1_DEV_3 *out;
    168168

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

    r26482 r27435  
    33/* convert PS1_REF formats to internal formats */
    44
    5 Measure *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, int Nvalues) {
    6 
    7   int i;
     5Measure *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, off_t Nvalues) {
     6
     7  off_t i;
    88  Measure *out;
    99
    … …  
    5656}
    5757
    58 Measure_PS1_REF *MeasureInternalTo_PS1_REF (Measure *in, int Nvalues) {
    59 
    60   int i;
     58Measure_PS1_REF *MeasureInternalTo_PS1_REF (Measure *in, off_t Nvalues) {
     59
     60  off_t i;
    6161  Measure_PS1_REF *out;
    6262
    … …  
    7979
    8080// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    81 Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, int Nvalues, SecFilt **primary) {
    82 
    83   int i;
     81Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, off_t Nvalues, SecFilt **primary) {
     82
     83  off_t i;
    8484  Average *out;
    8585
    … …  
    9797    out[i].P             = NAN;
    9898    out[i].dP            = NAN;
    99     out[i].Xp            = NAN;
     99    out[i].Xp            = NAN_S_SHORT;
    100100    out[i].ChiSq         = NAN;
    101101    out[i].Npos          = 0;
    … …  
    115115
    116116// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    117 Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, int Nvalues, SecFilt *primary) {
    118 
    119   int i;
     117Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, off_t Nvalues, SecFilt *primary) {
     118
     119  off_t i;
    120120  Average_PS1_REF *out;
    121121
    … …  
    138138}
    139139
    140 SecFilt *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, int Nvalues) {
    141 
    142   int i;
     140SecFilt *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, off_t Nvalues) {
     141
     142  off_t i;
    143143  SecFilt *out;
    144144
    … …  
    148148    out[i].M     = in[i].M;     
    149149    out[i].dM    = in[i].dM;     
    150     out[i].Xm    = NAN;
     150    out[i].Xm    = NAN_S_SHORT;
    151151    out[i].Ncode = 0;
    152152    out[i].Nused = 0;
    … …  
    157157}
    158158
    159 SecFilt_PS1_REF *SecFiltInternalTo_PS1_REF (SecFilt *in, int Nvalues) {
    160 
    161   int i;
     159SecFilt_PS1_REF *SecFiltInternalTo_PS1_REF (SecFilt *in, off_t Nvalues) {
     160
     161  off_t i;
    162162  SecFilt_PS1_REF *out;
    163163
    … …  
    171171}
    172172
    173 Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, int Nvalues) {
    174 
    175   int i;
     173Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues) {
     174
     175  off_t i;
    176176  Image *out;
    177177
    … …  
    230230}
    231231
    232 Image_PS1_REF *ImageInternalTo_PS1_REF (Image *in, int Nvalues) {
    233 
    234   int i;
     232Image_PS1_REF *ImageInternalTo_PS1_REF (Image *in, off_t Nvalues) {
     233
     234  off_t i;
    235235  Image_PS1_REF *out;
    236236
    … …  
    289289}
    290290
    291 PhotCode *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, int Nvalues) {
    292 
    293   int i;
     291PhotCode *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, off_t Nvalues) {
     292
     293  off_t i;
    294294  PhotCode *out;
    295295
    … …  
    325325}
    326326
    327 PhotCode_PS1_REF *PhotCode_Internal_To_PS1_REF (PhotCode *in, int Nvalues) {
    328 
    329   int i;
     327PhotCode_PS1_REF *PhotCode_Internal_To_PS1_REF (PhotCode *in, off_t Nvalues) {
     328
     329  off_t i;
    330330  PhotCode_PS1_REF *out;
    331331

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r26482 r27435  
    33/* convert PS1_V1 formats to internal formats */
    44
    5 Measure *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, int Nvalues) {
    6 
    7   int i;
     5Measure *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, off_t Nvalues) {
     6
     7  off_t i;
    88  Measure *out;
    99
    … …  
    5656}
    5757
    58 Measure_PS1_V1 *MeasureInternalTo_PS1_V1 (Measure *in, int Nvalues) {
    59 
    60   int i;
     58Measure_PS1_V1 *MeasureInternalTo_PS1_V1 (Measure *in, off_t Nvalues) {
     59
     60  off_t i;
    6161  Measure_PS1_V1 *out;
    6262
    … …  
    111111
    112112// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    113 Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, int Nvalues, SecFilt **primary) {
    114 
    115   int i;
     113Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, off_t Nvalues, SecFilt **primary) {
     114
     115  off_t i;
    116116  Average *out;
    117117
    … …  
    147147
    148148// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    149 Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, int Nvalues, SecFilt *primary) {
    150 
    151   int i;
     149Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, off_t Nvalues, SecFilt *primary) {
     150
     151  off_t i;
    152152  Average_PS1_V1 *out;
    153153
    … …  
    182182}
    183183
    184 SecFilt *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, int Nvalues) {
    185 
    186   int i;
     184SecFilt *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, off_t Nvalues) {
     185
     186  off_t i;
    187187  SecFilt *out;
    188188
    … …  
    201201}
    202202
    203 SecFilt_PS1_V1 *SecFiltInternalTo_PS1_V1 (SecFilt *in, int Nvalues) {
    204 
    205   int i;
     203SecFilt_PS1_V1 *SecFiltInternalTo_PS1_V1 (SecFilt *in, off_t Nvalues) {
     204
     205  off_t i;
    206206  SecFilt_PS1_V1 *out;
    207207
    … …  
    220220}
    221221
    222 Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, int Nvalues) {
    223 
    224   int i;
     222Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues) {
     223
     224  off_t i;
    225225  Image *out;
    226226
    … …  
    279279}
    280280
    281 Image_PS1_V1 *ImageInternalTo_PS1_V1 (Image *in, int Nvalues) {
    282 
    283   int i;
     281Image_PS1_V1 *ImageInternalTo_PS1_V1 (Image *in, off_t Nvalues) {
     282
     283  off_t i;
    284284  Image_PS1_V1 *out;
    285285
    … …  
    338338}
    339339
    340 PhotCode *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, int Nvalues) {
    341 
    342   int i;
     340PhotCode *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, off_t Nvalues) {
     341
     342  off_t i;
    343343  PhotCode *out;
    344344
    … …  
    374374}
    375375
    376 PhotCode_PS1_V1 *PhotCode_Internal_To_PS1_V1 (PhotCode *in, int Nvalues) {
    377 
    378   int i;
     376PhotCode_PS1_V1 *PhotCode_Internal_To_PS1_V1 (PhotCode *in, off_t Nvalues) {
     377
     378  off_t i;
    379379  PhotCode_PS1_V1 *out;
    380380

  • trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r21508 r27435  
    22
    33/* convert elixir-format measures to internal measures */
    4 Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, int Nvalues) {
    5 
    6   int i;
     4Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues) {
     5
     6  off_t i;
    77  Measure *out;
    88
    … …  
    6969
    7070/* convert internal measures to elixir-format measures */
    71 Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, int Nvalues) {
    72 
    73   int i;
     71Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues) {
     72
     73  off_t i;
    7474  Measure_Elixir *out;
    7575
    … …  
    108108
    109109/* convert elixir-format averages to internal averages */
    110 Average *Average_Elixir_ToInternal (Average_Elixir *in, int Nvalues, SecFilt **primary) {
    111 
    112   int i;
     110Average *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary) {
     111
     112  off_t i;
    113113  Average *out;
    114114
    … …  
    159159
    160160/* convert internal averages to elixir-format averages */
    161 Average_Elixir *AverageInternalTo_Elixir (Average *in, int Nvalues, SecFilt *primary) {
    162 
    163   int i;
     161Average_Elixir *AverageInternalTo_Elixir (Average *in, off_t Nvalues, SecFilt *primary) {
     162
     163  off_t i;
    164164  Average_Elixir *out;
    165165
    … …  
    189189
    190190/* convert elixir-format secfilts to internal secfilts */
    191 SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, int Nvalues) {
    192 
    193   int i;
     191SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, off_t Nvalues) {
     192
     193  off_t i;
    194194  SecFilt *out;
    195195
    … …  
    213213
    214214/* convert internal secfilts to elixir-format secfilts */
    215 SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, int Nvalues) {
    216 
    217   int i;
     215SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, off_t Nvalues) {
     216
     217  off_t i;
    218218  SecFilt_Elixir *out;
    219219
    … …  
    231231
    232232/* convert elixir-format images to internal images */
    233 Image *Image_Elixir_ToInternal (Image_Elixir *in, int Nvalues) {
    234 
    235   int i;
     233Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues) {
     234
     235  off_t i;
    236236  Image *out;
    237237
    … …  
    297297
    298298/* convert internal images to elixir-format images */
    299 Image_Elixir *ImageInternalTo_Elixir (Image *in, int Nvalues) {
    300 
    301   int i;
     299Image_Elixir *ImageInternalTo_Elixir (Image *in, off_t Nvalues) {
     300
     301  off_t i;
    302302  Image_Elixir *out;
    303303
    … …  
    355355}
    356356
    357 PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, int Nvalues) {
    358 
    359   int i;
     357PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, off_t Nvalues) {
     358
     359  off_t i;
    360360  PhotCode *out;
    361361
    … …  
    395395}
    396396
    397 PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, int Nvalues) {
    398 
    399   int i;
     397PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, off_t Nvalues) {
     398
     399  off_t i;
    400400  PhotCode_Elixir *out;
    401401

  • trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r21508 r27435  
    22
    33/* convert loneos-format measures to internal measures */
    4 Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, int Nvalues) {
    5 
    6   int i;
     4Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, off_t Nvalues) {
     5
     6  off_t i;
    77  Measure *out;
    88
    … …  
    7171
    7272/* convert internal measures to loneos-format measures */
    73 Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, int Nvalues) {
    74 
    75   int i;
     73Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, off_t Nvalues) {
     74
     75  off_t i;
    7676  Measure_Loneos *out;
    7777
    … …  
    9999
    100100/* convert loneos-format averages to internal averages */
    101 Average *Average_Loneos_ToInternal (Average_Loneos *in, int Nvalues, SecFilt **primary) {
    102 
    103   int i;
     101Average *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary) {
     102
     103  off_t i;
    104104  Average *out;
    105105
    … …  
    151151
    152152/* convert internal averages to loneos-format averages */
    153 Average_Loneos *AverageInternalTo_Loneos (Average *in, int Nvalues, SecFilt *primary) {
    154 
    155   int i;
     153Average_Loneos *AverageInternalTo_Loneos (Average *in, off_t Nvalues, SecFilt *primary) {
     154
     155  off_t i;
    156156  Average_Loneos *out;
    157157
    … …  
    180180
    181181/* convert loneos-format secfilts to internal secfilts */
    182 SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, int Nvalues) {
    183 
    184   int i;
     182SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, off_t Nvalues) {
     183
     184  off_t i;
    185185  SecFilt *out;
    186186
    … …  
    206206
    207207/* convert internal secfilts to loneos-format secfilts */
    208 SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, int Nvalues) {
    209 
    210   int i;
     208SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, off_t Nvalues) {
     209
     210  off_t i;
    211211  SecFilt_Loneos *out;
    212212
    … …  
    223223
    224224/* convert loneos-format images to internal images */
    225 Image *Image_Loneos_ToInternal (Image_Loneos *in, int Nvalues) {
    226 
    227   int i;
     225Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues) {
     226
     227  off_t i;
    228228  Image *out;
    229229
    … …  
    290290
    291291/* convert internal images to loneos-format images */
    292 Image_Loneos *ImageInternalTo_Loneos (Image *in, int Nvalues) {
    293 
    294   int i;
     292Image_Loneos *ImageInternalTo_Loneos (Image *in, off_t Nvalues) {
     293
     294  off_t i;
    295295  Image_Loneos *out;
    296296

  • trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r21508 r27435  
    22
    33/* convert panstarrs-format measures to internal measures */
    4 Measure *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, int Nvalues) {
    5 
    6   int i;
     4Measure *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, off_t Nvalues) {
     5
     6  off_t i;
    77  Measure *out;
    88
    … …  
    6666
    6767/* convert internal measures to panstarrs-format measures */
    68 Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, int Nvalues) {
    69 
    70   int i;
     68Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, off_t Nvalues) {
     69
     70  off_t i;
    7171  Measure_Panstarrs_DEV_0 *out;
    7272
    … …  
    115115/* convert panstarrs-format averages to internal averages */
    116116// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    117 Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, int Nvalues, SecFilt **primary) {
    118 
    119   int i;
     117Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, off_t Nvalues, SecFilt **primary) {
     118
     119  off_t i;
    120120  Average *out;
    121121
    … …  
    156156/* convert internal averages to panstarrs-format averages */
    157157// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    158 Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, int Nvalues, SecFilt *primary) {
    159 
    160   int i;
     158Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, off_t Nvalues, SecFilt *primary) {
     159
     160  off_t i;
    161161  Average_Panstarrs_DEV_0 *out;
    162162
    … …  
    191191
    192192/* convert panstarrs-format secfilts to internal secfilts */
    193 SecFilt *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, int Nvalues) {
    194 
    195   int i;
     193SecFilt *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, off_t Nvalues) {
     194
     195  off_t i;
    196196  SecFilt *out;
    197197
    … …  
    213213
    214214/* convert internal secfilts to panstarrs-format secfilts */
    215 SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, int Nvalues) {
    216 
    217   int i;
     215SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, off_t Nvalues) {
     216
     217  off_t i;
    218218  SecFilt_Panstarrs_DEV_0 *out;
    219219
    … …  
    231231
    232232/* convert panstarrs-format images to internal images */
    233 Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, int Nvalues) {
    234 
    235   int i;
     233Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues) {
     234
     235  off_t i;
    236236  Image *out;
    237237
    … …  
    297297
    298298/* convert internal images to panstarrs-format images */
    299 Image_Panstarrs_DEV_0 *ImageInternalTo_Panstarrs_DEV_0 (Image *in, int Nvalues) {
    300 
    301   int i;
     299Image_Panstarrs_DEV_0 *ImageInternalTo_Panstarrs_DEV_0 (Image *in, off_t Nvalues) {
     300
     301  off_t i;
    302302  Image_Panstarrs_DEV_0 *out;
    303303

  • trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r21508 r27435  
    22
    33/* convert panstarrs-format measures to internal measures */
    4 Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, int Nvalues) {
    5 
    6   int i;
     4Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, off_t Nvalues) {
     5
     6  off_t i;
    77  Measure *out;
    88
    … …  
    6666
    6767/* convert internal measures to panstarrs-format measures */
    68 Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, int Nvalues) {
    69 
    70   int i;
     68Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, off_t Nvalues) {
     69
     70  off_t i;
    7171  Measure_Panstarrs_DEV_1 *out;
    7272
    … …  
    115115/* convert panstarrs-format averages to internal averages */
    116116// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    117 Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, int Nvalues, SecFilt **primary) {
    118 
    119   int i;
     117Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, off_t Nvalues, SecFilt **primary) {
     118
     119  off_t i;
    120120  Average *out;
    121121
    … …  
    156156/* convert internal averages to panstarrs-format averages */
    157157// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    158 Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, int Nvalues, SecFilt *primary) {
    159 
    160   int i;
     158Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary) {
     159
     160  off_t i;
    161161  Average_Panstarrs_DEV_1 *out;
    162162
    … …  
    191191
    192192/* convert panstarrs-format secfilts to internal secfilts */
    193 SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, int Nvalues) {
    194 
    195   int i;
     193SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, off_t Nvalues) {
     194
     195  off_t i;
    196196  SecFilt *out;
    197197
    … …  
    213213
    214214/* convert internal secfilts to panstarrs-format secfilts */
    215 SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, int Nvalues) {
    216 
    217   int i;
     215SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, off_t Nvalues) {
     216
     217  off_t i;
    218218  SecFilt_Panstarrs_DEV_1 *out;
    219219
    … …  
    231231
    232232/* convert panstarrs-format images to internal images */
    233 Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, int Nvalues) {
    234 
    235   int i;
     233Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues) {
     234
     235  off_t i;
    236236  Image *out;
    237237
    … …  
    297297
    298298/* convert internal images to panstarrs-format images */
    299 Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, int Nvalues) {
    300 
    301   int i;
     299Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, off_t Nvalues) {
     300
     301  off_t i;
    302302  Image_Panstarrs_DEV_1 *out;
    303303

  • trunk/Ohana/src/libdvo/src/dvo_image.c

    r25757 r27435  
    5252  /* test for NAXIS == 2 in line 3 */
    5353  bzero (buffer, 241);
    54   fseek (db[0].f, 0, SEEK_SET);
     54  fseeko (db[0].f, 0, SEEK_SET);
    5555  Nread = fread (buffer, 1, 240, db[0].f);
    5656  if (Nread != 240) {
    … …  
    6363    return (FALSE);
    6464  }
    65   fseek (db[0].f, 0, SEEK_SET);
     65  fseeko (db[0].f, 0, SEEK_SET);
    6666
    6767  /* default values */
    … …  
    114114}
    115115
    116 int dvo_image_addrows (FITS_DB *db, Image *new, int Nnew) {
    117 
    118   int Nimages;
     116int dvo_image_addrows (FITS_DB *db, Image *new, off_t Nnew) {
     117
     118  off_t Nimages;
    119119
    120120  /* adjust header */
    121121  Nimages = 0;
    122   gfits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimages);
     122  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimages);
    123123  Nimages += Nnew;
    124   gfits_modify (&db[0].header, "NIMAGES", "%d", 1, Nimages);
     124  gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, (long long) Nimages);
    125125
    126126  gfits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
    … …  
    195195  gfits_table_set_Image (&db[0].ftable, NULL, 0);
    196196
    197   gfits_modify (&db[0].header, "NIMAGES", "%d", 1, 0);
     197  gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, 0LL);
    198198  gfits_modify (&db[0].header, "ZERO_PT", "%lf", 1, ZeroPoint);
    199199

  • trunk/Ohana/src/libdvo/src/dvo_image_raw.c

    r24748 r27435  
    77int dvo_image_load_raw (FITS_DB *db, int VERBOSE, int FORCE_READ) {
    88
    9   int Nimage, Ndata, size, ImageSize, nbytes, Nbytes;
     9  off_t Nimage, Ndata, size, ImageSize, nbytes, Nbytes;
    1010  struct stat filestatus;
    1111  char format[80], telescope[80];
    … …  
    3939  /* find number of images */
    4040  Nimage = 0;
    41   gfits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimage);
     41  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    4242  if (stat (db[0].filename, &filestatus) == -1) {
    4343    if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
    … …  
    5959
    6060  /* check that filesize makes sense */
    61   size = Nimage*ImageSize + db[0].header.size;
     61  size = Nimage*ImageSize + db[0].header.datasize;
    6262  if (size != filestatus.st_size) {
    63     Ndata = (filestatus.st_size - db[0].header.size) / ImageSize;
     63    Ndata = (filestatus.st_size - db[0].header.datasize) / ImageSize;
    6464    if (VERBOSE) fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
    65     if (VERBOSE) fprintf (stderr, "header: %d, data: %d\n", Nimage, Ndata);
     65    if (VERBOSE) fprintf (stderr, "header: %lld, data: %lld\n", (long long) Nimage, (long long) Ndata);
    6666    if (!FORCE_READ) exit (1);
    6767    Nimage = Ndata;
    … …  
    9494  }
    9595
    96   gfits_modify (&db[0].theader, "NAXIS2", "%d", 1, Nimage);
     96  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
    9797  db[0].theader.Naxis[1] = Nimage;
    98   db[0].ftable.size = gfits_data_size (&db[0].theader);
     98  db[0].ftable.datasize = gfits_data_size (&db[0].theader);
    9999  db[0].swapped = FALSE;  /* table does not have internal byte-order */
    100100  return (TRUE);
    … …  
    104104int dvo_image_update_raw (FITS_DB *db, int VERBOSE) {
    105105
    106   int i, Nx, Ny, Nrow, Nbytes;
    107   int status, start, offset;
    108   int *row;
     106  off_t i, Nx, Ny, Nrow, Nbytes, start, offset;
     107  off_t status;
     108  off_t *row;
    109109
    110   if (VERBOSE) fprintf (stderr, "writing out %d images\n", db[0].vtable.Nrow);
     110  if (VERBOSE) fprintf (stderr, "writing out %lld images\n", (long long) db[0].vtable.Nrow);
    111111
    112112  /* position to start of file */
    113   Fseek (db[0].f, 0, SEEK_SET);
     113  fseeko (db[0].f, 0, SEEK_SET);
    114114 
    115115  /* write out complete header (no check on disk size?) */
    116   status = fwrite (db[0].header.buffer, 1, db[0].header.size, db[0].f);
    117   if (status != db[0].header.size) {
     116  status = fwrite (db[0].header.buffer, 1, db[0].header.datasize, db[0].f);
     117  if (status != db[0].header.datasize) {
    118118    fprintf (stderr, "ERROR: failed writing data to image header\n");
    119119    exit (1);
    … …  
    123123  Nrow = db[0].vtable.Nrow;
    124124  row = db[0].vtable.row;
    125   gfits_scan (db[0].vtable.header, "NAXIS1", "%d", 1, &Nx);
    126   gfits_scan (db[0].vtable.header, "NAXIS2", "%d", 1, &Ny);
     125  gfits_scan (db[0].vtable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     126  gfits_scan (db[0].vtable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    127127
    128128  /* file pointer is at beginning of desired table data */
    … …  
    131131  for (i = 0; i < Nrow; i++) {
    132132    offset = start + Nx*row[i];
    133     fseek (db[0].f, offset, SEEK_SET);
     133    fseeko (db[0].f, offset, SEEK_SET);
    134134    Nbytes = fwrite (db[0].vtable.buffer[i], sizeof (char), Nx, db[0].f);
    135135    if (Nbytes != Nx) { return (FALSE); }
    … …  
    141141int dvo_image_save_raw (FITS_DB *db, int VERBOSE) {
    142142
    143   int status, Nx, Ny, size, Nbytes;
     143  off_t Nx, Ny, size, Nbytes;
     144  int status;
    144145
    145   if (VERBOSE) fprintf (stderr, "writing out %d images\n", db[0].theader.Naxis[1]);
     146  if (VERBOSE) fprintf (stderr, "writing out %lld images\n", (long long) db[0].theader.Naxis[1]);
    146147
    147148  /* position to start of file */
    … …  
    149150 
    150151  /* write out complete header (no check on disk size?) */
    151   status = fwrite (db[0].header.buffer, 1, db[0].header.size, db[0].f);
    152   if (status != db[0].header.size) {
     152  status = fwrite (db[0].header.buffer, 1, db[0].header.datasize, db[0].f);
     153  if (status != db[0].header.datasize) {
    153154    fprintf (stderr, "ERROR: failed writing data to image header\n");
    154155    exit (1);
    155156  }
    156157
    157   gfits_scan (db[0].ftable.header, "NAXIS1", "%d", 1, &Nx);
    158   gfits_scan (db[0].ftable.header, "NAXIS2", "%d", 1, &Ny);
     158  gfits_scan (db[0].ftable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     159  gfits_scan (db[0].ftable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    159160  size = Nx * Ny;
    160161  Nbytes = fwrite (db[0].ftable.buffer, sizeof(char), size, db[0].f);

  • trunk/Ohana/src/libdvo/src/dvo_util.c

    r26410 r27435  
    1818
    1919    memset(config, 0, sizeof(dvoConfig));
     20    return config;
    2021}
    2122
    … …  
    9899    }
    99100
    100     char *catdir, filename[256];
     101    char filename[256];
    101102 
    102103    sprintf (filename, "%s/Images.dat", dvoConfig->catdir);
    … …  
    136137Image *dvoImageByExternID(dvoConfig *dvoConfig, int sourceID, int externID)
    137138{
    138     Image *images;
    139     int Nimage;
    140139    int i;
    141140   
    … …  
    199198}
    200199
    201 int dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID)
    202 {
    203   int QUIET = 0;
    204   int FULL_OUTPUT = 0;
     200off_t dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID)
     201{
    205202  int GetMeasures = 1;
    206   int SaveVectors = 0;
    207203  int reg;
    208   int Ndetect = 0;
     204  off_t Ndetect = 0;
    209205
    210206  int detectionsArrayLength = 1000;
    … …  
    226222      dvo_catalog_unlock (&catalog);
    227223
    228       int Nstars = catalog.Naverage;
    229       int Nmeasure = catalog.Nmeasure;
    230 
    231       int i;
     224      off_t Nmeasure = catalog.Nmeasure;
     225
     226      off_t i;
    232227      for (i=0; i< Nmeasure; i++) {
    233228        Measure *m = catalog.measure + i;
    … …  
    265260
    266261      memset(sorted, 0, sizeof(dvoDetection) * *pMaxDetID);
    267       int i;
     262      off_t i;
    268263      for (i = 0; i < Ndetect; i++) {
    269264           sorted[detections[i].meas.detID] = detections[i];

  • trunk/Ohana/src/libdvo/src/dvosorts.c

    r21508 r27435  
    44
    55/* values are ave[i].R, ave[i].D, ave[i].M */
    6 void sortave (Average *ave, int N) {
     6void sortave (Average *ave, off_t N) {
    77
    88# define SWAPFUNC(A,B){ Average tmp; tmp = ave[A]; ave[A] = ave[B]; ave[B] = tmp; }
    … …  
    1717
    1818/* sort subset by image[subset[i]].tzero */
    19 void sort_image_subset (Image *image, int *subset, int N) {
     19void sort_image_subset (Image *image, off_t *subset, off_t N) {
    2020
    2121# define SWAPFUNC(A,B){ int tmp; tmp = subset[A]; subset[A] = subset[B]; subset[B] = tmp; }
    … …  
    3030
    3131/* sort a coordinate pair (X,Y) and the associated index (S) */
    32 void sort_coords_index (double *X, double *Y, int *S, int N) {
     32void sort_coords_index (double *X, double *Y, off_t *S, off_t N) {
    3333 
    34 # define SWAPFUNC(A,B){ double dtmp; int itmp; \
     34# define SWAPFUNC(A,B){ double dtmp; off_t itmp; \
    3535  dtmp = X[A]; X[A] = X[B]; X[B] = dtmp; \
    3636  dtmp = Y[A]; Y[A] = Y[B]; Y[B] = dtmp; \
    … …  
    4646}
    4747
    48 void sort_regions (SkyRegion *region, int N) {
     48void sort_regions (SkyRegion *region, off_t N) {
    4949
    5050# define SWAPFUNC(A,B){ SkyRegion tmp; tmp = region[A]; region[A] = region[B]; region[B] = tmp; }
    … …  
    5757
    5858}
    59 
    60 # if (0)
    61 // deprecated along with Stars as an autocode type
    62 void sort_stars_ra (Stars *stars, int N) {
    63 
    64 # define SWAPFUNC(A,B){ Stars tmp; tmp = stars[A]; stars[A] = stars[B]; stars[B] = tmp; }
    65 # define COMPARE(A,B)(stars[A].R < stars[B].R)
    66 
    67   OHANA_SORT (N, COMPARE, SWAPFUNC);
    68 
    69 # undef SWAPFUNC
    70 # undef COMPARE
    71 
    72 }
    73 # endif

  • trunk/Ohana/src/libdvo/src/fits_db.c

    r15750 r27435  
    9292}
    9393
    94 /* load the data from Nrows from table starting at start; load header, etc if needed */
    95 int gfits_db_load_segment (FITS_DB *db, int start, int Nrows) {
    96 
    97   int Nskip;
     94/* load the Nrows data from table starting at start; load header, etc if needed */
     95int gfits_db_load_segment (FITS_DB *db, off_t start, off_t Nrows) {
     96
     97  off_t Nskip;
    9898
    9999  /* database name must be set first */
    … …  
    119119    }
    120120  } else {
    121     Nskip = db[0].header.size;
     121    Nskip = db[0].header.datasize;
    122122    Fseek (db[0].f, Nskip, SEEK_CUR);
    123123  }
    … …  
    141141    }
    142142  } else {
    143     Nskip = db[0].header.size;
     143    Nskip = db[0].header.datasize;
    144144    Fseek (db[0].f, Nskip, SEEK_CUR);
    145145  }

  • trunk/Ohana/src/libdvo/src/mosaic_astrom.c

    r21047 r27435  
    11# include <dvo.h>
    22
     3off_t getDISentry (e_time start, e_time stop, e_time *startMos, off_t *indexMos, off_t Nmosaic);
     4void SortDISindex (e_time *S, off_t *I, off_t N);
     5
    36/* chip-match table: j = ChipMatch[i], images[j] is DIS for images[i] WRP */
    47
    5 static int    iDIS = -1;      // DIS entry in ChipMatch[]
    6 static int    Ndis = 0;
    7 static int    *DISentry = NULL;
     8static off_t  iDIS = -1;      // DIS entry in ChipMatch[]
     9static off_t  Ndis = 0;
     10static off_t  *DISentry = NULL;
    811static e_time *DIStzero = NULL;
    9 static int    *ChipMatch = NULL;
     12static off_t  *ChipMatch = NULL;
    1013
    1114/* what is the currently registered mosaic image? */
    12 int GetRegisteredMosaic () {
     15off_t GetRegisteredMosaic () {
    1316  return (iDIS);
    1417}
    1518
    1619/* given an image array and a current entry of type WRP, find matching DIS & Register it */
    17 int FindMosaicForImage (Image *images, int Nimages, int entry) {
     20int FindMosaicForImage (Image *images, off_t Nimages, off_t entry) {
    1821
    1922  int status;
    … …  
    2831
    2932/* given an image array and a current entry of type WRP, find matching DIS & Register it */
    30 int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry) {
     33int FindMosaicForImage_TableSearch (Image *images, off_t Nimages, off_t entry) {
    3134
    3235  e_time tzero;
    33   int i;
     36  off_t i;
    3437
    3538  /* search backwards for image with same time and type DIS */
    … …  
    6568
    6669/* given an image array and a current entry of type WRP, find matching DIS & Register it */
    67 int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry) {
    68 
    69   int N;
     70int FindMosaicForImage_MatchSearch (Image *images, off_t Nimages, off_t entry) {
     71
     72  off_t N;
    7073
    7174  if (strcmp(&images[entry].coords.ctype[4], "-WRP")) {
    7275    /* not a wrp image, do nothing */
    73     return (TRUE); /* error or not */
     76    return (TRUE); /* error or not? */
    7477  }
    7578
    … …  
    8588}
    8689
    87 int BuildChipMatch (Image *images, int Nimages) {
    88 
    89   int i, j, NDIS;
     90int BuildChipMatch_old (Image *images, off_t Nimages) {
     91
     92  off_t i, j, NDIS;
    9093
    9194  if (DISentry != NULL) free (DISentry);
    … …  
    9699  Ndis = 0;
    97100  NDIS = 100;
    98   ALLOCATE (DISentry, int, NDIS);
     101  ALLOCATE (DISentry, off_t, NDIS);
    99102  ALLOCATE (DIStzero, e_time, NDIS);
    100103
    … …  
    106109    if (Ndis >= NDIS) {
    107110      NDIS += 100;
    108       REALLOCATE (DISentry, int, NDIS);
     111      REALLOCATE (DISentry, off_t, NDIS);
    109112      REALLOCATE (DIStzero, e_time, NDIS);
    110113    }
    … …  
    112115
    113116  /* find all matched WRP images */
    114   ALLOCATE (ChipMatch, int, Nimages);
     117  ALLOCATE (ChipMatch, off_t, Nimages);
    115118  for (i = 0; i < Nimages; i++) {
    116119    ChipMatch[i] = -1;
    … …  
    131134  return (TRUE);
    132135}
     136
     137int BuildChipMatch (Image *images, off_t Nimages) {
     138
     139  off_t i, j, NDIS;
     140
     141  if (DISentry != NULL) free (DISentry);
     142  if (DIStzero != NULL) free (DIStzero);
     143  if (ChipMatch != NULL) free (ChipMatch);
     144
     145  // allocate containers for DIS indexing
     146  Ndis = 0;
     147  NDIS = 100;
     148  ALLOCATE (DISentry, off_t, NDIS);
     149  ALLOCATE (DIStzero, e_time, NDIS);
     150
     151  // find all DIS images, save tzero (& instrument)
     152  for (i = 0; i < Nimages; i++) {
     153    if (strcmp(&images[i].coords.ctype[4], "-DIS")) continue;
     154    DISentry[Ndis] = i;
     155    DIStzero[Ndis] = images[i].tzero;
     156    Ndis ++;
     157    if (Ndis >= NDIS) {
     158      NDIS += 100;
     159      REALLOCATE (DISentry, off_t, NDIS);
     160      REALLOCATE (DIStzero, e_time, NDIS);
     161    }
     162  }
     163
     164  // sort the index, start, and stop by the start times:
     165  SortDISindex (DIStzero, DISentry, Ndis);
     166
     167  /* find all matched WRP images */
     168  ALLOCATE (ChipMatch, off_t, Nimages);
     169  for (i = 0; i < Nimages; i++) {
     170    ChipMatch[i] = -1;
     171    if (strcmp(&images[i].coords.ctype[4], "-WRP")) continue;
     172
     173    j = getDISentry (images[i].tzero, images[i].tzero + (int) images[i].exptime, DIStzero, DISentry, Ndis);
     174    if (j == -1) {
     175      fprintf (stderr, "WARNING: can't find matching mosaic \n");
     176      ChipMatch[i] = -2;
     177      continue;
     178    }
     179    if (j >= Nimages) abort();
     180
     181    ChipMatch[i] = j;
     182  }
     183  return (TRUE);
     184}
     185
     186off_t getDISentry (e_time start, e_time stop, e_time *startMos, off_t *indexMos, off_t Nmosaic) {
     187
     188  // use bisection to find the overlapping mosaic
     189
     190  off_t Nlo, Nhi, N;
     191
     192  // find the last mosaic before start
     193  Nlo = 0; Nhi = Nmosaic;
     194  while (Nhi - Nlo > 10) {
     195    N = 0.5*(Nlo + Nhi);
     196    if (startMos[N] < start) {
     197      Nlo = MAX(N, 0);
     198    } else {
     199      Nhi = MIN(N + 1, Nmosaic);
     200    }
     201  }
     202
     203  // check for the matched mosaic starting from Nlo
     204  // we may have to go much beyond Nlo since stop is not sorted
     205  // can we use a sorted version of stop to check when we are beyond the valid range??
     206  for (N = Nlo; N < Nmosaic; N++) {
     207    if (startMos[N] < start) continue;
     208    if (startMos[N] > stop) return (-1);
     209    return (indexMos[N]);
     210  }
     211
     212  return (-1);
     213}
     214
     215// sort two times vectors and an index by first time vector
     216void SortDISindex (e_time *S, off_t *I, off_t N) {
     217
     218# define SWAPFUNC(A,B){ e_time tmp_t; off_t tmp_i; \
     219  tmp_t = S[A]; S[A] = S[B]; S[B] = tmp_t; \
     220  tmp_i = I[A]; I[A] = I[B]; I[B] = tmp_i; \
     221}
     222# define COMPARE(A,B)(S[A] < S[B])
     223
     224  OHANA_SORT (N, COMPARE, SWAPFUNC);
     225
     226# undef SWAPFUNC
     227# undef COMPARE
     228
     229}
     230

  • trunk/Ohana/src/libdvo/src/skyregion_io.c

    r25757 r27435  
    126126
    127127  /* third option: GSCFILE */
     128
     129  if (gscfile == NULL) {
     130    fprintf (stderr, "error loading sky table from existing db (%s)\n", catdir);
     131    return (NULL);
     132  }
     133
    128134  sky = SkyTableFromGSC (gscfile, depth, verbose);
    129135  if (sky == NULL) {

  • trunk/Ohana/src/libdvo/src/skyregion_ops.c

    r24976 r27435  
    386386SkyList *SkyListChildrenByBounds_List (SkyList *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax) {
    387387
    388   int i, j, Ns, Ne, Nnew, NNEW;
    389   int append;
    390   SkyList *children;
     388  int i, Nnew, NNEW;
    391389  SkyList *list;
    392390  SkyRegion **region;
Note: See TracChangeset for help on using the changeset viewer.