IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27305


Ignore:
Timestamp:
Mar 17, 2010, 9:58:05 AM (16 years ago)
Author:
eugene
Message:

ongoing upgrade to largefile support

Location:
branches/eam_branches/largefiles.20100314/Ohana/src
Files:
1 deleted
116 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/include/delstar.h

    r21153 r27305  
    4040int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
    4141FILE      *GetDB                  PROTO((int *state));
    42 Image     *GetImages              PROTO((int *nimage));
    43 int        SetImages              PROTO((Image *new, int Nnew));
     42Image     *GetImages              PROTO((off_t *nimage));
     43int        SetImages              PROTO((Image *new, off_t Nnew));
    4444void       SetProtect             PROTO((int mode));
    4545int        SetSignals             PROTO((void));
    … …  
    5252void       delete_times           PROTO((FITS_DB *db));
    5353int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
    54 int       *find_images_data       PROTO((FITS_DB *db, Image *timage, int *nlist));
    55 int       *find_images_name       PROTO((FITS_DB *db, char *filename, int *nlist));
    56 int       *find_images_time       PROTO((FITS_DB *db, time_t start, time_t end, PhotCode *code, int *nlist));
    57 void       find_matches           PROTO((Catalog *catalog, int photcode, int start, int end));
     54off_t     *find_images_data       PROTO((FITS_DB *db, Image *timage, off_t *nlist));
     55off_t     *find_images_name       PROTO((FITS_DB *db, char *filename, off_t *nlist));
     56off_t     *find_images_time       PROTO((FITS_DB *db, e_time start, e_time end, PhotCode *code, off_t *nlist));
     57void       find_matches           PROTO((Catalog *catalog, int photcode, e_time start, e_time end));
    5858int        gcatalog               PROTO((Catalog *catalog));
    5959Image     *gimages                PROTO((char *filename));
    60 Image     *gtimes                 PROTO((int *NIMAGE));
     60Image     *gtimes                 PROTO((off_t *NIMAGE));
    6161void       help                   PROTO((void));
    6262int        load_image_db          PROTO((FITS_DB *db));
    6363void       lock_image_db          PROTO((FITS_DB *db, char *filename));
    64 void       match_images           PROTO((Catalog *catalog, Image *image, int Nimage));
     64void       match_images           PROTO((Catalog *catalog, Image *image, off_t Nimage));
    6565double     opening_angle          PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
    66 int        parse_time             PROTO((Header *header));
     66e_time     parse_time             PROTO((Header *header));
    6767int        save_image_db          PROTO((void));
    6868void       sort_lists             PROTO((float *X, float *Y, int *S, int N));

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagefile.c

    r25757 r27305  
    33void delete_imagefile (FITS_DB *db, char *filename) {
    44
    5   int i, Nimlist;
    6   int *imlist;
     5  off_t i, Nimlist;
     6  off_t *imlist;
    77  double trange;
    8   time_t start, stop;
     8  e_time start, stop;
    99  Image *image;
    1010  Catalog catalog;

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagename.c

    r25757 r27305  
    33void delete_imagename (FITS_DB *db, char *name) {
    44
    5   int i, j, k;
    6   int Nimlist, Nimage, Noutimage;
    7   int *imlist;
     5  off_t i, j, k;
     6  off_t Nimlist, Nimage, Noutimage;
     7  off_t *imlist;
    88  double trange;
    99  time_t start, stop;
    … …  
    7777  Noutimage = Nimage - Nimlist;
    7878 
    79   if (VERBOSE) fprintf (stderr, "removing %d images (leaving %d of %d)\n", Nimlist, Noutimage, Nimage);
     79  if (VERBOSE) fprintf (stderr, "removing %lld images (leaving %lld of %lld)\n", (long long) Nimlist, (long long) Noutimage, (long long) Nimage);
    8080  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
    8181
    82   gfits_modify (&db[0].theader, "NAXIS2", "%d", 1, Noutimage);
    83   gfits_modify (&db[0].header, "NIMAGES", "%d", 1, Noutimage);
     82  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, Noutimage);
     83  gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, Noutimage);
    8484  db[0].theader.Naxis[1] = Noutimage;
    8585  db[0].ftable.buffer = (char *) outimage;

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_missed.c

    r4680 r27305  
    55delete_missed (Catalog *catalog) {
    66
    7   int i;
    8   int Nave, Nmeas, Nmiss;
     7  off_t i, Nave, Nmeas, Nmiss;
    98
    109  Nave = catalog[0].Naverage;
    … …  
    1211  Nmiss = catalog[0].Nmissing;
    1312 
    14   if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
     13  if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
    1514
    1615  /* set up references for missing to average */
    … …  
    2019  REALLOCATE (catalog[0].missing, Missing, 1);
    2120  catalog[0].Nmissing = 0;
    22   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
     21  if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
    2322}
    2423

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_orphans.c

    r17198 r27305  
    33delete_orphans (char *name) {
    44
    5   int i, j, k, n, m, N, M, found;
    6   int *N1, *N2,  *next, *next_miss, *ave_miss, last, last_miss;
    7   int Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch;
    8   int start, end, Nmeasfound, Nsecfilt;
     5  off_t i, j, k, n, m, Nmeasfound, Nsecfilt, N, M, found;
     6  off_t *next_meas, *next_miss, *ave_miss, last, last_miss;
     7  off_t Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch;
     8  e_time start, end;
    99  unsigned int flags;
    1010  Measure *tmpmeasure;
    … …  
    2626
    2727  Nmeas = catalog.Nmeasure;
    28   ALLOCATE (next, int, Nmeas);
     28  ALLOCATE (next_meas, int, Nmeas);
    2929 
    3030  Nmiss = catalog.Nmissing;
    … …  
    3636  /* set up pointers for linked list of measure */
    3737  for (i = 0; i < Nmeas - 1; i++) {
    38     next[i] = i+1;
    39   }
    40   next[i] = -1;
     38    next_meas[i] = i+1;
     39  }
     40  next_meas[i] = -1;
    4141  last = i;
    4242  /* set up pointers for linked list of missing */
    … …  
    6060      /* this star is an orphan */
    6161      Nmeasfound ++;
    62       next[i] = -2; /* we delete this one */
     62      next_meas[i] = -2; /* we delete this one */
    6363      /* fix the list links: connect the previous valid link to the next valid link */
    64       for (j = i; (j >= 0) && (next[j] == -2); j--); /* find previous entry to fix link */
     64      for (j = i; (j >= 0) && (next_meas[j] == -2); j--); /* find previous entry to fix link */
    6565      if (j >= 0) { /* if j < 0, there is no previous valid link, ignore this step */
    66         if (next[j] != i) {
     66        if (next_meas[j] != i) {
    6767          fprintf (stderr, "error?  this link seems to have been lost\n");
    6868          exit (1);
    6969        }
    7070        /* find next valid entry to fix link */
    71         for (k = i; (k < Nmeas) && (next[k] == -2); k++);
     71        for (k = i; (k < Nmeas) && (next_meas[k] == -2); k++);
    7272        if (k < Nmeas)
    73           next[j] = k;
     73          next_meas[j] = k;
    7474        else
    75           next[j] = -1;  /* last link in list gets a -1 */
     75          next_meas[j] = -1;  /* last link in list gets a -1 */
    7676      }
    7777     
    … …  
    111111        m = catalog.average[n].offset;
    112112        /* find next valid entry -- notice lack of error checking... */
    113         for (j = 0; (j < Nmeas) && (next[m+j] == -2); j++);
     113        for (j = 0; (j < Nmeas) && (next_meas[m+j] == -2); j++);
    114114        catalog.average[n].offset = m + j;
    115115      }
    … …  
    218218      tmpmeasure[N] = catalog.measure[n];
    219219      tmpmeasure[N].averef = i;
    220       n = next[n];
     220      n = next_meas[n];
    221221    }
    222222  }

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_times.c

    r25757 r27305  
    33void delete_times (FITS_DB *db) {
    44
    5   int i, j, k, n;
    6   int Nimage, Nimlist, found, code;
    7   int Nregions, NREGIONS;
    8   int *imlist;
     5  int found, code;
     6  off_t i, j, k, n;
     7  off_t Nimage, Nimlist;
     8  off_t Nregions, NREGIONS;
     9  off_t *imlist;
    910  SkyList *skylist, *skyset;
    1011  SkyTable *sky;

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_image_db.c

    r16810 r27305  
    11# include "delstar.h"
    22
    3 int *find_images_name (FITS_DB *db, char *filename, int *nlist) {
     3off_t *find_images_name (FITS_DB *db, char *filename, off_t *nlist) {
    44
    5   int i, Nimage, Nlist, NLIST;
    6   int *list;
     5  off_t i, Nimage, Nlist, NLIST;
     6  off_t *list;
    77  char *p, *name;
    88  Image *image;
    … …  
    2020  Nlist = 0;
    2121  NLIST = 100;
    22   ALLOCATE (list, int, NLIST);
     22  ALLOCATE (list, off_t, NLIST);
    2323
    2424  for (i = 0; i < Nimage; i++) {
    … …  
    2626    list[Nlist] = i;
    2727    Nlist ++;
    28     CHECK_REALLOCATE (list, int, NLIST, Nlist, 100);
     28    CHECK_REALLOCATE (list, off_t, NLIST, Nlist, 100);
    2929  }
    3030
    … …  
    3434
    3535/* find images in db by image data (time/photcode) */
    36 int *find_images_data (FITS_DB *db, Image *timage, int *nlist) {
     36off_t *find_images_data (FITS_DB *db, Image *timage, off_t *nlist) {
    3737
    38   int i, Nimage, Nlist, NLIST;
    39   int *list;
     38  off_t i, Nimage, Nlist, NLIST;
     39  off_t *list;
    4040  Image *image;
    4141  time_t start, stop;
    … …  
    5050  Nlist = 0;
    5151  NLIST = 100;
    52   ALLOCATE (list, int, NLIST);
     52  ALLOCATE (list, off_t, NLIST);
    5353
    5454  for (i = 0; i < Nimage; i++) {
    … …  
    5858    list[Nlist] = i;
    5959    Nlist ++;
    60     CHECK_REALLOCATE (list, int, NLIST, Nlist, 100);
     60    CHECK_REALLOCATE (list, off_t, NLIST, Nlist, 100);
    6161  }
    6262
    … …  
    6666
    6767/* find images in db by image data (time/photcode) */
    68 int *find_images_time (FITS_DB *db, time_t start, time_t end, PhotCode *code, int *nlist) {
     68off_t *find_images_time (FITS_DB *db, e_time start, e_time end, PhotCode *code, off_t *nlist) {
    6969
    70   int i, Nimage, Nlist, NLIST;
    71   int *list;
     70  off_t i, Nimage, Nlist, NLIST;
     71  off_t *list;
    7272  Image *image;
    7373
    … …  
    7676  Nlist = 0;
    7777  NLIST = 100;
    78   ALLOCATE (list, int, NLIST);
     78  ALLOCATE (list, off_t, NLIST);
    7979
    8080  for (i = 0; i < Nimage; i++) {
    … …  
    8686    list[Nlist] = i;
    8787    Nlist ++;
    88     CHECK_REALLOCATE (list, int, NLIST, Nlist, 100);
     88    CHECK_REALLOCATE (list, off_t, NLIST, Nlist, 100);
    8989  }
    9090

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_matches.c

    r17244 r27305  
    11# include "delstar.h"
    22
    3 void find_matches (Catalog *catalog, int photcode, int start, int end) {
    4 
    5   int i, j, k, n, m, N, M, drop, averef;
    6   int *next, *next_miss, *ave_miss, last, last_miss;
    7   int Nave, Nmeas, NMEAS, Nmiss;
    8   int Nmeasfound, Nsecfilt;
    9   int this, prev;
     3void find_matches (Catalog *catalog, int photcode, e_time start, e_time end) {
     4
     5  int drop;
     6  off_t i, j, k, n, m, N, M, averef;
     7  off_t *next_meas, *next_miss, *ave_miss, last, last_miss;
     8  off_t Nave, Nmeas, NMEAS, Nmiss;
     9  off_t Nmeasfound, Nsecfilt;
     10  off_t this, prev;
    1011  Measure *tmpmeasure;
    1112  Missing *tmpmissing;
    … …  
    1516
    1617  Nmeas = catalog[0].Nmeasure;
    17   ALLOCATE (next, int, MAX(Nmeas,1));
     18  ALLOCATE (next_meas, off_t, MAX(Nmeas,1));
    1819 
    1920  Nmiss = catalog[0].Nmissing;
    20   ALLOCATE (next_miss, int, MAX(Nmiss,1));
    21   ALLOCATE (ave_miss, int, MAX(Nmiss,1));
     21  ALLOCATE (next_miss, off_t, MAX(Nmiss,1));
     22  ALLOCATE (ave_miss, off_t, MAX(Nmiss,1));
    2223 
    23   if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
     24  if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
    2425
    2526  /* set up pointers for linked list of measure */
    2627  for (i = 0; i < Nmeas - 1; i++) {
    27     next[i] = i+1;
    28   }
    29   next[i] = -1;
     28    next_meas[i] = i+1;
     29  }
     30  next_meas[i] = -1;
    3031  last = i;
    3132  /* set up pointers for linked list of missing */
    … …  
    6364
    6465    /* this star is in this image */
    65     this = next[i];
    66     next[i] = -2; /* we delete this one */
    67     if (prev != -1) { next[prev] = this; }
     66    this = next_meas[i];
     67    next_meas[i] = -2; /* we delete this one */
     68    if (prev != -1) { next_meas[prev] = this; }
    6869
    6970# if (0)
    7071    /* why is this section disabled? */
    7172    /* fix the list links: connect the previous valid link to the next valid link */
    72     for (j = i; (j >= 0) && (next[j] == -2); j--); /* find previous entry to fix link */
     73    for (j = i; (j >= 0) && (next_meas[j] == -2); j--); /* find previous entry to fix link */
    7374    if (j >= 0) { /* if j < 0, there is no previous valid link, ignore this step */
    74       if (next[j] != i) {
     75      if (next_meas[j] != i) {
    7576        fprintf (stderr, "error? (1)  this link seems to have been lost\n");
    76         fprintf (stderr, "j: %d, next[j]: %d, i: %d\n", j, next[j], i);
     77        fprintf (stderr, "j: %lld, next_meas[j]: %lld, i: %lld\n", (long long) j, (long long) next_meas[j], (long long) i);
    7778        exit (1);
    7879      }
    7980      /* find next valid entry to fix link */
    80       for (k = i; (k < Nmeas) && (next[k] == -2); k++);
     81      for (k = i; (k < Nmeas) && (next_meas[k] == -2); k++);
    8182      if (k < Nmeas)
    82         next[j] = k;
     83        next_meas[j] = k;
    8384      else
    84         next[j] = -1;  /* last link in list gets a -1 */
     85        next_meas[j] = -1;  /* last link in list gets a -1 */
    8586    }
    8687# endif     
    … …  
    107108        if (next_miss[j] != m) {
    108109          fprintf (stderr, "error? (2) this link seems to have been lost\n");
    109           fprintf (stderr, "j: %d, next_miss[j]: %d, i: %d\n", j, next_miss[j], i);
     110          fprintf (stderr, "j: %lld, next_miss[j]: %lld, i: %lld\n", (long long) j, (long long) next_miss[j], (long long) i);
    110111          exit (1);
    111112        }
    … …  
    122123      m = catalog[0].average[n].measureOffset;
    123124      /* find next valid entry -- notice lack of error checking... */
    124       for (j = 0; (j < Nmeas) && (next[m+j] == -2); j++);
     125      for (j = 0; (j < Nmeas) && (next_meas[m+j] == -2); j++);
    125126      if (catalog[0].measure[m+j].averef != n) {
    126127        fprintf (stderr, "error? measure.averef and average.measureOffset are mismatched\n");
    … …  
    130131    }
    131132  }
    132   fprintf (stderr, "found %d meas to remove\n", Nmeasfound);
     133  fprintf (stderr, "found %lld meas to remove\n", (long long) Nmeasfound);
    133134
    134135  if (VERBOSE) fprintf (stderr, "fixing missing...");
    … …  
    145146      if (next_miss[j] != i) {
    146147        fprintf (stderr, "error? (3) this link seems to have been lost\n");
    147         fprintf (stderr, "j: %d, next_miss[j]: %d, i: %d\n", j, next_miss[j], i);
     148        fprintf (stderr, "j: %lld, next_miss[j]: %lld, i: %lld\n", (long long) j, (long long) next_miss[j], (long long) i);
    148149        exit (1);
    149150      }
    … …  
    209210      tmpmeasure[N] = catalog[0].measure[n];
    210211      tmpmeasure[N].averef = i;
    211       n = next[n];
     212      n = next_meas[n];
    212213      CHECK_REALLOCATE (tmpmeasure, Measure, NMEAS, N, 10000);
    213214    }
    … …  
    248249  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    249250
    250   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
    251 
    252   free (next);
     251  if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
     252
     253  free (next_meas);
    253254  free (next_miss);
    254255  free (ave_miss);

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/match_images.c

    r16810 r27305  
    11# include "delstar.h"
    22
    3 void match_images (Catalog *catalog, Image *image, int Nimage) {
     3void match_images (Catalog *catalog, Image *image, off_t Nimage) {
    44 
    5   int j, k, found;
    6   unsigned int *start, *stop;
     5  off_t j, k, found;
     6  e_time *start, *stop;
    77
    88  /* this must be allocated so future free will not fail */

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/parse_time.c

    r20936 r27305  
    11# include "delstar.h"
    22
    3 int parse_time (Header *header) {
     3e_time parse_time (Header *header) {
    44
    55  double jd;

  • branches/eam_branches/largefiles.20100314/Ohana/src/elixir/src/ProcessOps.c

    r10336 r27305  
    203203  switch (Nterms) {
    204204  case 0:
    205     sprintf (line, format);
     205    sprintf (line, "%s", format);
    206206    break;
    207207  case 1:

  • branches/eam_branches/largefiles.20100314/Ohana/src/gastro2/src/rfits.c

    r7080 r27305  
    33StarData *rfits (FILE *f, int *nstars) {
    44
    5   int i, N, Nstars;
     5  int N;
     6  off_t i, Nstars;
    67  Header theader;
    78  FTable table;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/altpath.c

    r7080 r27305  
    22# include "detrend.h"
    33
    4 int SetAltpath (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch) {
     4int SetAltpath (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch) {
    55 
    6   int i, j, n, found, status, Nlist;
    7   int *list, *current;
     6  int status, found;
     7  off_t i, j, n, Nlist;
     8  off_t *list, *current;
    89  char *dBPath, infile[256], outfile[256], line[1024];
    910  struct stat statbuf;
    1011
    11   ALLOCATE (current, int, Nimage);
    12   ALLOCATE (list, int, Nimage);
     12  ALLOCATE (current, off_t, Nimage);
     13  ALLOCATE (list, off_t, Nimage);
    1314  Nlist = 0;
    1415

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/criteria.c

    r3593 r27305  
    6060*/
    6161
    62 Match *ExptimeCriteria (DetReg *image, int Nimage, Match *match, int *nmatch) {
    63 
    64   int i, j, Nmatch, Nnew, NNEW, entry;
     62Match *ExptimeCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch) {
     63
     64  off_t i, j, Nmatch, Nnew, NNEW, entry;
    6565  unsigned long dtime;
    6666  float Chi, ChiMin;
    … …  
    132132}
    133133
    134 Match *CloseCriteria (DetReg *image, int Nimage, Match *match, int *nmatch) {
    135 
    136   int i, j, Nmatch, Nnew, NNEW, Ngood, entry;
     134Match *CloseCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch) {
     135
     136  off_t i, j, Nmatch, Nnew, NNEW, Ngood, entry;
    137137  unsigned long dmin, dtime;
    138138  Match *new;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/delete.c

    r7080 r27305  
    22# include "detrend.h"
    33
    4 void DeleteSubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch) {
     4void DeleteSubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch) {
    55
    6   int i, j;
    7   int *keep, Ndel, Nsubset;
     6  off_t i, j;
     7  off_t *keep, Ndel, Nsubset;
    88  DetReg *subset;
    99
    10   ALLOCATE (keep, int, MAX (Nimage, 1));
     10  ALLOCATE (keep, off_t, MAX (Nimage, 1));
    1111  for (i = 0; i < Nimage; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %d detrend images\n", Nimage);
     12  fprintf (stderr, "total of %lld detrend images\n", (long long) Nimage);
    1313
    1414  Ndel = 0;
    … …  
    2020    delete_image (&image[i]);
    2121  }
    22   fprintf (stderr, "delete %d images\n", Ndel);
     22  fprintf (stderr, "delete %lld images\n", (long long) Ndel);
    2323  if (Ndel == 0) {
    2424    fprintf (stderr, "SUCCESS\n");
    … …  
    3030  Nsubset = Nimage - Ndel;
    3131  ALLOCATE (subset, DetReg, MAX (1, Nsubset));
    32   fprintf (stderr, "keeping %d images\n", Nsubset);
     32  fprintf (stderr, "keeping %lld images\n", (long long) Nsubset);
    3333  for (j = i = 0; i < Nimage; i++) {
    3434    if (!keep[i]) continue;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/match.c

    r3593 r27305  
    22# include "detrend.h"
    33
    4 Match *MatchCriteria (DetReg *image, int Nimage, int *nmatch) {
     4Match *MatchCriteria (DetReg *image, off_t Nimage, off_t *nmatch) {
    55
    6   int i;
    7   int Nmatch, NMATCH;
     6  off_t i;
     7  off_t Nmatch, NMATCH;
    88  Match result, *match;
    99

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/modify.c

    r7080 r27305  
    22# include "detrend.h"
    33
    4 int ModifySubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch) {
     4int ModifySubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch) {
    55 
    6   int i, j, value;
    7   int *list;
     6  off_t i, j, value;
     7  off_t *list;
    88 
    99  value = M_UNDEF;
    1010
    11   ALLOCATE (list, int, Nimage);
     11  ALLOCATE (list, off_t, Nimage);
    1212  if (!strcasecmp (output.ModifyEntry, "mode")) {
    1313    value = get_image_mode (output.ModifyValue);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/output.c

    r14590 r27305  
    55extern double drand48();
    66
    7 int OutputSubset (DetReg *image, int Nimage, Match *match, int Nmatch) {
     7int OutputSubset (DetReg *image, off_t Nimage, Match *match, off_t Nmatch) {
    88
    99  if (output.table != (char *) NULL) {
    … …  
    1919
    2020/* write out complete binary FITS table in format of db */
    21 int DumpFitsBintable (char *filename, DetReg *image, Match *match, int Nmatch) {
    22 
    23   int i, j;
     21int DumpFitsBintable (char *filename, DetReg *image, Match *match, off_t Nmatch) {
     22
     23  off_t i, j;
    2424  FILE *f;
    2525  Header header;
    … …  
    6060}
    6161
    62 int DumpFitsTable (char *filename, DetReg *detdata, Match *match, int Nmatch) {
     62int DumpFitsTable (char *filename, DetReg *detdata, Match *match, off_t Nmatch) {
    6363 
    6464  Header header, theader;
    … …  
    6969  char *startstr, *stopstr, *regstr, *line, key[33], ccdinfo[16];
    7070  char *filtstr, *typestr, *modestr, *ccdstr, *datestr, *p;
    71   int i;
     71  off_t i;
    7272  time_t tsecond;
    7373
    … …  
    191191
    192192/* Select, TimeMode are global */
    193 int PrintSubset (DetReg *detdata, Match *match, int Nmatch) {
     193int PrintSubset (DetReg *detdata, Match *match, off_t Nmatch) {
    194194 
    195195  char *dBPath, *Path, *typestr, *filtstr, filename[128];
    196196  char *timestr, *modestr, *ccdstr, ccdinfo[16], ccdformat[16];
    197   int i, j, Nc;
     197  off_t i, j;
     198  int Nc;
    198199  struct timeval now;
    199200  long A;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/select.c

    r3606 r27305  
    22# include "detrend.h"
    33
    4 Match SelectEntry (DetReg *image, int Nimage, Match *list, int Nlist, Criteria *crit) {
     4Match SelectEntry (DetReg *image, off_t Nimage, Match *list, off_t Nlist, Criteria *crit) {
    55
    66  /* force a single selection */
    … …  
    1515  */
    1616
    17   int i, j, entry, order, matchnum;
    18   int nmatch, Nmatch;
     17  off_t i, j, entry, order, matchnum;
     18  off_t nmatch, Nmatch;
    1919  unsigned int tstart;
    2020  Match *match, *tmatch, answer;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/unique.c

    r3606 r27305  
    33
    44/* define a list of best images which have unique properties */
    5 Match *UniqueSubset (DetReg *image, int Nimage, Match *match, int *nmatch) {
     5Match *UniqueSubset (DetReg *image, off_t Nimage, Match *match, off_t *nmatch) {
    66
    7   int Nsubset, Nunique, Ncrit, NCRIT;
    8   int i, j, N, Nmatch, found;
     7  int found;
     8  off_t Nsubset, Nunique, Ncrit, NCRIT;
     9  off_t i, j, N, Nmatch;
    910  Criteria *crit;
    1011  Match *subset, *unique, *local;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/dumpfits.c

    r14590 r27305  
    33
    44/* write out complete binary FITS table in format of db */
    5 int DumpFitsBintable (char *filename, Image *image, int *match, int Nmatch) {
     5int DumpFitsBintable (char *filename, Image *image, off_t *match, off_t Nmatch) {
    66
    7   int i, j;
     7  off_t i, j;
    88  FILE *f;
    99  Header header;
    … …  
    4444}
    4545
    46 int DumpFitsTable (char *filename, Image *image, int *match, int Nmatch) {
     46int DumpFitsTable (char *filename, Image *image, off_t *match, off_t Nmatch) {
    4747 
    4848  Header header;
    … …  
    5353  FILE *f;
    5454  char *startstr, *filtstr, *datestr, *line;
    55   int i;
     55  off_t i;
    5656  double zp, dzp, ra, dec, airmass, sky;
    5757  time_t tsecond;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/modify.c

    r21508 r27305  
    22# include "imphot.h"
    33
    4 void ModifySubset (FITS_DB *db, Image *image, int Nimage, int *match, int Nmatch) {
     4void ModifySubset (FITS_DB *db, Image *image, off_t Nimage, off_t *match, off_t Nmatch) {
    55
    6   int i, j;
     6  off_t i, j;
    77
    88  /* modify the selected entries */

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/output.c

    r21508 r27305  
    22# include "imphot.h"
    33
    4 int output (Image *image, int *match, int Nmatch) {
     4int output (Image *image, off_t *match, off_t Nmatch) {
    55
    66  int status;
    … …  
    2222}
    2323
    24 int PrintSubset (Image *image, int *match, int Nmatch) {
     24int PrintSubset (Image *image, off_t *match, off_t Nmatch) {
    2525
    26   int i, j;
     26  off_t i, j;
    2727  char *timestr, *photstr;
    2828  static char PhotError[] = "unknown";

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/subset.c

    r21508 r27305  
    22# include "imphot.h"
    33
    4 int *subset (Image *image, int Nimage, int *nsubset) {
     4off_t *subset (Image *image, off_t Nimage, off_t *nsubset) {
    55
    6   int i, j, status;
    7   int Nsubset, NameSelectLength;
    8   int *index;
     6  off_t i, j, status;
     7  off_t Nsubset, NameSelectLength;
     8  off_t *index;
    99
    1010  NameSelectLength = 0;
    … …  
    1212  /* allocate space for reference lists */
    1313  Nsubset = 0;
    14   ALLOCATE (index, int, Nimage);
     14  ALLOCATE (index, off_t, Nimage);
    1515 
    1616  if (criteria.NameSelect) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/cadc.c

    r16040 r27305  
    44static int REFCCD;
    55
    6 void DumpCADCTable (char *filename, RegImage *image, int *match, int Nmatch) {
    7  
    8   int i, Obsid, Nobsid, Nsubset, ref;
     6void DumpCADCTable (char *filename, RegImage *image, off_t *match, off_t Nmatch) {
     7 
     8  off_t i, Obsid, Nobsid, Nsubset, ref;
    99  char *datestr, *line, hdrname[99];
    1010  time_t tsecond;
    … …  
    1313  FTable table;
    1414  RegImage *row;
    15   int *index, *entry, *obsid;
     15  off_t *index, *entry, *obsid;
    1616  MosaicLayout *layout;
    17   int *subset;
     17  off_t *subset;
    1818  double left, right, center, outer, top, bottom;
    1919  double iqx, iqy, iqr, iqf, iqo;
    … …  
    127127}
    128128
    129 int *GetObsIDSubset (RegImage *image, int start, int *index, int *entry, int Nindex, int *Nsubset) {
    130 
    131   int i, N, NSUBSET;
    132   int *subset;
     129off_t *GetObsIDSubset (RegImage *image, off_t start, off_t *index, off_t *entry, off_t Nindex, off_t *Nsubset) {
     130
     131  off_t i, N, NSUBSET;
     132  off_t *subset;
    133133
    134134  /* create output index */
    135135  N = 0;
    136136  NSUBSET = 64;
    137   ALLOCATE (subset, int, NSUBSET);
     137  ALLOCATE (subset, off_t, NSUBSET);
    138138
    139139  /* find unique sequences */
    … …  
    143143    if (N == NSUBSET) {
    144144      NSUBSET += 64;
    145       REALLOCATE (subset, int, NSUBSET);
     145      REALLOCATE (subset, off_t, NSUBSET);
    146146    }
    147147  }
    … …  
    152152
    153153/* return an index list of unique obs id entries at start of sequence */
    154 int *GetUniqueObsID (RegImage *image, int *index, int *entry, int Nindex, int *Nmatch) {
    155  
    156   int i, j, N, NMATCH;
    157   int *match;
     154off_t *GetUniqueObsID (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t *Nmatch) {
     155 
     156  off_t i, j, N, NMATCH;
     157  off_t *match;
    158158
    159159  /* create output index */
    160160  N = 0;
    161161  NMATCH = 1000;
    162   ALLOCATE (match, int, NMATCH);
     162  ALLOCATE (match, off_t, NMATCH);
    163163
    164164  /* find unique sequences */
    … …  
    171171    if (N == NMATCH) {
    172172      NMATCH += 1000;
    173       REALLOCATE (match, int, NMATCH);
     173      REALLOCATE (match, off_t, NMATCH);
    174174    }
    175175
    … …  
    182182
    183183/* return seeing for ccd == REFCCD */
    184 int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start) {
    185  
    186   int i, N, NMATCH;
    187   int *match;
     184off_t GetREFCCD (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t start) {
     185 
     186  off_t i, N, NMATCH;
     187  off_t *match;
    188188
    189189  /* create output index */
    190190  N = 0;
    191191  NMATCH = 1000;
    192   ALLOCATE (match, int, NMATCH);
     192  ALLOCATE (match, off_t, NMATCH);
    193193
    194194  /* find unique sequences */
    … …  
    199199}
    200200
    201 void GetObsIDIndex (RegImage *image, int *match, int Nmatch, int **Index, int **Entry) {
    202 
    203   int i;
    204   int *index, *entry;
     201void GetObsIDIndex (RegImage *image, off_t *match, off_t Nmatch, off_t **Index, off_t **Entry) {
     202
     203  off_t i;
     204  off_t *index, *entry;
    205205
    206206  /* index = OBSID */
    207   ALLOCATE (index, int, Nmatch);
    208   ALLOCATE (entry, int, Nmatch);
     207  ALLOCATE (index, off_t, Nmatch);
     208  ALLOCATE (entry, off_t, Nmatch);
    209209  for (i = 0; i < Nmatch; i++) {
    210210    index[i] = atoi (image[match[i]].filename);
    … …  
    212212    entry[i] = match[i];
    213213  }
    214   isortpair (index, entry, Nmatch);
     214  llsortpair (index, entry, Nmatch);
    215215  *Index = index;
    216216  *Entry = entry;
    … …  
    218218
    219219/* match is a list of image entries with the same obsid */
    220 double MosaicIQStats (RegImage *image, int *match, int Nmatch, MosaicRegion *region) {
    221 
    222   int i, j, N, Nccd;
     220double MosaicIQStats (RegImage *image, off_t *match, off_t Nmatch, MosaicRegion *region) {
     221
     222  int i, N, Nccd;
     223  off_t j;
    223224  double *list, value;
    224225

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/delete.c

    r7080 r27305  
    22# include "imreg.h"
    33
    4 void DeleteSubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch) {
     4void DeleteSubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) {
    55
    6   int i, j;
    7   int *keep, Ndel, Nsubset;
     6  off_t i, j;
     7  off_t *keep, Ndel, Nsubset;
    88  RegImage *subset;
    99
    10   ALLOCATE (keep, int, MAX (Nimage, 1));
     10  ALLOCATE (keep, off_t, MAX (Nimage, 1));
    1111  for (i = 0; i < Nimage; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %d images\n", Nimage);
     12  fprintf (stderr, "total of %lld images\n", (long long) Nimage);
    1313
    1414  Ndel = 0;
    … …  
    1919    Ndel ++;
    2020  }
    21   fprintf (stderr, "delete %d images\n", Ndel);
     21  fprintf (stderr, "delete %lld images\n", (long long) Ndel);
    2222  if (Ndel == 0) {
    2323    fprintf (stderr, "SUCCESS\n");
    … …  
    2929  Nsubset = Nimage - Ndel;
    3030  ALLOCATE (subset, RegImage, MAX (1, Nsubset));
    31   fprintf (stderr, "keeping %d images\n", Nsubset);
     31  fprintf (stderr, "keeping %lld images\n", (long long) Nsubset);
    3232  for (j = i = 0; i < Nimage; i++) {
    3333    if (!keep[i]) continue;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/match.c

    r3606 r27305  
    22# include "imreg.h"
    33
    4 int *match_criteria (RegImage *image, int Nimage, int *Nmatch) {
     4off_t *match_criteria (RegImage *image, off_t Nimage, off_t *Nmatch) {
    55
    6   int i, j, Nname;
    7   int N, NMATCH;
    8   int *match;
    9   int reject;
     6  off_t i, j, Nname;
     7  off_t N, NMATCH;
     8  off_t *match;
     9  off_t reject;
    1010
    1111  /* create selection index */
    1212  N = 0;
    1313  NMATCH = 1000;
    14   ALLOCATE (match, int, NMATCH);
     14  ALLOCATE (match, off_t, NMATCH);
    1515
    1616  Nname = 0;
    … …  
    3636    if (N == NMATCH) {
    3737      NMATCH += 1000;
    38       REALLOCATE (match, int, NMATCH);
     38      REALLOCATE (match, off_t, NMATCH);
    3939    }
    4040  }
    … …  
    4343}
    4444
    45 int *match_images (RegImage *image, int Nimage, RegImage *subset, int Nsubset, int *Nmatch) {
     45off_t *match_images (RegImage *image, off_t Nimage, RegImage *subset, off_t Nsubset, off_t *Nmatch) {
    4646 
    47   int i, j, N, Nfound;
    48   int *match;
     47  off_t i, j, N, Nfound;
     48  off_t *match;
    4949
    5050  /* find matching images - very inefficient : sort by obstime, find those first? */
    51   ALLOCATE (match, int, Nsubset);
     51  ALLOCATE (match, off_t, Nsubset);
    5252  for (j = 0; j < Nsubset; j++) {
    5353    match[j] = -1;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/modify.c

    r7080 r27305  
    22# include "imreg.h"
    33
    4 void ModifySubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch) {
     4void ModifySubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) {
    55
    6   int i, j, Nold;
     6  off_t i, j, Nold;
    77  char *tmppath;
    88  char *ext, *root, *path, dist;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/newimages.c

    r3606 r27305  
    22# include "imreg.h"
    33
    4 RegImage *newimages (RegImage *image, int *Nimage) {
     4RegImage *newimages (RegImage *image, off_t *Nimage) {
    55
    6   int i, Nnew;
     6  off_t i, Nnew;
    77  RegImage *regimage;
    88

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/output.c

    r14590 r27305  
    2424
    2525/* given a subset list, write out the selected images, if desired */
    26 void OutputSubset (RegImage *image, int Nimage, int *match, int Nmatch) {
     26void OutputSubset (RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) {
    2727
    2828  if (output.table != (char *) NULL) {
    … …  
    4545
    4646/* write out complete binary FITS table in format of db */
    47 void DumpFitsBintable (char *filename, RegImage *image, int *match, int Nmatch) {
    48 
    49   int i, j;
     47void DumpFitsBintable (char *filename, RegImage *image, off_t *match, off_t Nmatch) {
     48
     49  off_t i, j;
    5050  FILE *f;
    5151  Header header;
    … …  
    8787}
    8888
    89 void DumpFitsTable (char *filename, RegImage *image, int *match, int Nmatch) {
    90  
    91   int i;
     89void DumpFitsTable (char *filename, RegImage *image, off_t *match, off_t Nmatch) {
     90 
     91  off_t i;
    9292  char *obsstr, *regstr, *line, dummy[64];
    9393  char *modestr, *typestr, *ccdstr, *datestr;
    … …  
    184184
    185185/* Select, TimeMode are global */
    186 int PrintSubset (RegImage *image, int *match, int Nmatch) {
     186int PrintSubset (RegImage *image, off_t *match, off_t Nmatch) {
    187187 
    188188  char ccdstr[64]; 
    189   int i, j;
     189  off_t i, j;
    190190  char *modestr, *typestr, *timestr, *root, *path;
    191191
    … …  
    227227    } else {
    228228      /* this is somewhat poor: I have predefined a subset of value, and I can't guarantee that 'filter' has no spaces */
    229       fprintf (stdout, "%5d %6s %6s %s  ", i, typestr, modestr, ccdstr);
     229      fprintf (stdout, "%5lld %6s %6s %s  ", (long long) i, typestr, modestr, ccdstr);
    230230      fprintf (stdout, "%s %s  ", image[i].pathname, image[i].filename);
    231231      fprintf (stdout, "%s %f %s %f %f %f\n", image[i].filter, image[i].exptime,
    … …  
    238238}
    239239
    240 int dump_data (RegImage *image, int Nimage) {
    241 
    242   int i;
     240int dump_data (RegImage *image, off_t Nimage) {
     241
     242  off_t i;
    243243
    244244  for (i = 0; i < Nimage; i++) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/unique.c

    r16045 r27305  
    22# include "imreg.h"
    33
    4 void sortstr (char **S, int *X, int N) {
     4void sortstr (char **S, off_t *X, off_t N) {
    55
    66# define SWAPFUNC(A,B){ \
    7   char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
    8   int itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
     7  char  *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
     8  off_t itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
    99}
    1010# define COMPARE(A,B)(strcmp(S[A], S[B]) < 0)
    … …  
    1818
    1919/* input is a subset index of image list, output is a new subset */
    20 int *unique_entries (RegImage *image, int Nimage, int *subset, int *Nmatch) {
     20off_t *unique_entries (RegImage *image, off_t Nimage, off_t *subset, off_t *Nmatch) {
    2121
    22   int i, j, k, m, Nsubset;
    23   int N, NMATCH;
    24   int *match, *entry;
     22  off_t i, j, k, m, Nsubset;
     23  off_t N, NMATCH;
     24  off_t *match, *entry;
    2525  char idxline[128];
    2626  char **index;
    … …  
    3131  N = 0;
    3232  NMATCH = 1000;
    33   ALLOCATE (match, int, NMATCH);
     33  ALLOCATE (match, off_t, NMATCH);
    3434
    3535  Nsubset = *Nmatch;
    … …  
    3737  /* index = filename.ccd */
    3838  ALLOCATE (index, char *, Nsubset);
    39   ALLOCATE (entry, int, Nsubset);
     39  ALLOCATE (entry, off_t, Nsubset);
    4040  for (i = 0; i < Nsubset; i++) {
    4141    sprintf (idxline, "%s.%02d", image[subset[i]].filename, image[subset[i]].ccd);
    … …  
    6363    if (N == NMATCH) {
    6464      NMATCH += 1000;
    65       REALLOCATE (match, int, NMATCH);
     65      REALLOCATE (match, off_t, NMATCH);
    6666    }
    6767

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/detrend.h

    r21153 r27305  
    8282char **LoadRecipe (char *filter, int *nrecipe);
    8383
    84 Match *MatchCriteria (DetReg *image, int Nimage, int *nmatch);
    85 Match *UniqueSubset (DetReg *image, int Nimage, Match *match, int *nmatch);
    86 Match *ExptimeCriteria (DetReg *image, int Nimage, Match *match, int *nmatch);
    87 Match *CloseCriteria (DetReg *image, int Nimage, Match *match, int *nmatch);
     84Match *MatchCriteria (DetReg *image, off_t Nimage, off_t *nmatch);
     85Match *UniqueSubset (DetReg *image, off_t Nimage, Match *match, off_t *nmatch);
     86Match *ExptimeCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch);
     87Match *CloseCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch);
    8888
    8989Match CheckCriteria (DetReg *image);
    9090
    91 int OutputSubset (DetReg *image, int Nimage, Match *match, int Nmatch);
    92 int DumpFitsTable (char *filename, DetReg *detdata, Match *match, int Nmatch);
    93 int PrintSubset (DetReg *detdata, Match *match, int Nmatch);
    94 Match SelectEntry (DetReg *image, int Nimage, Match *list, int Nlist, Criteria *crit);
     91int OutputSubset (DetReg *image, off_t Nimage, Match *match, off_t Nmatch);
     92int DumpFitsTable (char *filename, DetReg *detdata, Match *match, off_t Nmatch);
     93int PrintSubset (DetReg *detdata, Match *match, off_t Nmatch);
     94Match SelectEntry (DetReg *image, off_t Nimage, Match *list, off_t Nlist, Criteria *crit);
    9595
    9696int usage (void);
    … …  
    101101
    102102int escape (int mode, char *message);
    103 int DumpFitsBintable (char *filename, DetReg *image, Match *match, int Nmatch);
     103int DumpFitsBintable (char *filename, DetReg *image, Match *match, off_t Nmatch);
    104104int cmp_crit (Criteria *crit, DetReg *image);
    105105int set_crit (Criteria *crit, DetReg *image);
    … …  
    107107int PrintCriteria (void);
    108108
    109 int SetAltpath (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch);
    110 int ModifySubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch);
    111 void DeleteSubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch);
     109int SetAltpath (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch);
     110int ModifySubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch);
     111void DeleteSubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imphot.h

    r12332 r27305  
    2020int db_load (FITS_DB *db);
    2121int args (int argc, char **argv);
    22 int DumpFitsBintable (char *filename, Image *image, int *match, int Nmatch);
    23 int DumpFitsTable (char *filename, Image *image, int *match, int Nmatch);
    24 void ModifySubset (FITS_DB *db, Image *image, int Nimage, int *match, int Nmatch);
    25 int PrintSubset (Image *image, int *match, int Nmatch);
    26 int output (Image *image, int *match, int Nmatch);
     22int DumpFitsBintable (char *filename, Image *image, off_t *match, off_t Nmatch);
     23int DumpFitsTable (char *filename, Image *image, off_t *match, off_t Nmatch);
     24void ModifySubset (FITS_DB *db, Image *image, off_t Nimage, off_t *match, off_t Nmatch);
     25int PrintSubset (Image *image, off_t *match, off_t Nmatch);
     26int output (Image *image, off_t *match, off_t Nmatch);
    2727int rfits (FITS_DB *db);
    2828int rtext (FITS_DB *db);
    29 int *subset (Image *image, int Nimage, int *nsubset);
     29off_t *subset (Image *image, off_t Nimage, off_t *nsubset);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imreg.h

    r21153 r27305  
    7474int args (int argc, char **argv);
    7575
    76 void DeleteSubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch);
     76void DeleteSubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch);
    7777RegImage *iminfo (char *filename);
    7878
    79 int *match_criteria (RegImage *image, int Nimage, int *Nmatch);
    80 int *match_images (RegImage *image, int Nimage, RegImage *subset, int Nsubset, int *Nmatch);
     79off_t *match_criteria (RegImage *image, off_t Nimage, off_t *Nmatch);
     80off_t *match_images (RegImage *image, off_t Nimage, RegImage *subset, off_t Nsubset, off_t *Nmatch);
    8181
    82 RegImage *newimages (RegImage *image, int *Nimage);
     82RegImage *newimages (RegImage *image, off_t *Nimage);
    8383
    84 void ModifySubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch);
     84void ModifySubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch);
    8585void SetOutputMode (char *mode);
    86 void OutputSubset (RegImage *image, int Nimage, int *match, int Nmatch);
    87 void DumpFitsBintable (char *filename, RegImage *image, int *match, int Nmatch);
    88 void DumpFitsTable (char *filename, RegImage *image, int *match, int Nmatch);
    89 int PrintSubset (RegImage *image, int *match, int Nmatch);
    90 int dump_data (RegImage *image, int Nimage);
     86void OutputSubset (RegImage *image, off_t Nimage, off_t *match, off_t Nmatch);
     87void DumpFitsBintable (char *filename, RegImage *image, off_t *match, off_t Nmatch);
     88void DumpFitsTable (char *filename, RegImage *image, off_t *match, off_t Nmatch);
     89int PrintSubset (RegImage *image, off_t *match, off_t Nmatch);
     90int dump_data (RegImage *image, off_t Nimage);
    9191int SubmitImages (RegImage *image);
    9292int load_probes (char *filename, unsigned long tzero, int *wantprobe, double *values, int Nprobe);
    … …  
    9494void set_timezone (double dt);
    9595
    96 void DumpCADCTable (char *filename, RegImage *image, int *match, int Nmatch);
    97 int *GetObsIDSubset (RegImage *image, int start, int *index, int *entry, int Nindex, int *Nsubset);
    98 int *GetUniqueObsID (RegImage *image, int *index, int *entry, int Nindex, int *Nmatch);
    99 void GetObsIDIndex (RegImage *image, int *match, int Nmatch, int **Index, int **Entry);
     96void DumpCADCTable (char *filename, RegImage *image, off_t *match, off_t Nmatch);
     97off_t *GetObsIDSubset (RegImage *image, off_t start, off_t *index, off_t *entry, off_t Nindex, off_t *Nsubset);
     98off_t *GetUniqueObsID (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t *Nmatch);
     99void GetObsIDIndex (RegImage *image, off_t *match, off_t Nmatch, off_t **Index, off_t **Entry);
    100100double SigmaClipList (double *list, int N);
    101 double MosaicIQStats (RegImage *image, int *match, int Nmatch, MosaicRegion *region);
     101double MosaicIQStats (RegImage *image, off_t *match, off_t Nmatch, MosaicRegion *region);
    102102MosaicLayout *CreateCFH12K (void);
    103103MosaicLayout *CreateMegaCam (void);
    104 int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start);
     104off_t GetREFCCD (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t start);
    105105
    106106int imregclient (char *fitsfile, char *statfile, char *datfile);
    … …  
    128128int memstr (char *m1, char *m2, int n);
    129129
    130 int *unique_entries (RegImage *image, int Nimage, int *subset, int *Nmatch);
     130off_t *unique_entries (RegImage *image, off_t Nimage, off_t *subset, off_t *Nmatch);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imregister.h

    r21153 r27305  
    7373
    7474int parse_time (Header *header);
    75 void sort (float *value, int N);
    76 void dsort (double *value, int N);
    77 void sortstr (char **S, int *X, int N);
    78 void sortpair (int *X, int *Y, int N);
     75void sortstr (char **S, off_t *X, off_t N);
    7976
    8077void ConfigCamera (void);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/photreg.h

    r12332 r27305  
    2929int regargs (int argc, char **argv, PhotPars *);
    3030
    31 void DeleteSubset (FITS_DB *db, PhotPars *photpars, int Nphotpars, int *match, int Nmatch);
    32 int *match_criteria (PhotPars *photpars, int Nphotpars, int *Nmatch);
     31void DeleteSubset (FITS_DB *db, PhotPars *photpars, off_t Nphotpars, off_t *match, off_t Nmatch);
     32off_t *match_criteria (PhotPars *photpars, off_t Nphotpars, off_t *Nmatch);
    3333
    34 void OutputSubset (PhotPars *photpars, int Nphotpars, int *match, int Nmatch);
     34void OutputSubset (PhotPars *photpars, off_t Nphotpars, off_t *match, off_t Nmatch);
    3535
    36 void DumpFitsBintable (char *filename, PhotPars *image, int *match, int Nmatch);
    37 void DumpFitsTable (char *filename, PhotPars *image, int *match, int Nmatch);
    38 int PrintSubset (PhotPars *image, int *match, int Nmatch);
     36void DumpFitsBintable (char *filename, PhotPars *image, off_t *match, off_t Nmatch);
     37void DumpFitsTable (char *filename, PhotPars *image, off_t *match, off_t Nmatch);
     38int PrintSubset (PhotPars *image, off_t *match, off_t Nmatch);
    3939
    4040void set_timezone (double dt);
    … …  
    4242int escape (int mode, char *message);
    4343
    44 PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, int Nphotpars);
     44PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, off_t Nphotpars);
    4545

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/spreg.h

    r12332 r27305  
    7878char TelescopeKeyword[64];
    7979
     80int args (int argc, char **argv);
     81off_t *match_criteria (Spectrum *spectrum, off_t Nspectrum, off_t *Nmatch);
     82off_t *unique_entries (Spectrum *spectrum, off_t Nspectrum, off_t *subset, off_t *Nmatch);
    8083
    81 int args (int argc, char **argv);
    82 int *match_criteria (Spectrum *spectrum, int Nspectrum, int *Nmatch);
    83 int *unique_entries (Spectrum *spectrum, int Nspectrum, int *subset, int *Nmatch);
    84 
    85 void ModifySubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch);
    86 void DeleteSubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch);
    87 void OutputSubset (Spectrum *spectrum, int Nspectrum, int *match, int Nmatch);
     84void ModifySubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch);
     85void DeleteSubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch);
     86void OutputSubset (Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch);
    8887
    8988void SetOutputMode (char *mode);
    90 void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch);
    91 void DumpFitsTable (char *filename, Spectrum *spectrum, int *match, int Nmatch);
    92 int PrintSubset (Spectrum *spectrum, int *match, int Nmatch);
    93 int dump_data (Spectrum *spectrum, int Nspectrum);
     89void DumpFitsBintable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch);
     90void DumpFitsTable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch);
     91int PrintSubset (Spectrum *spectrum, off_t *match, off_t Nmatch);
     92int dump_data (Spectrum *spectrum, off_t Nspectrum);
    9493
    9594Spectrum *spinfo (char *filename);
    96 int *match_spectrums (Spectrum *subset, int Nsubset, int *Nmatch);
     95off_t *match_spectrums (Spectrum *subset, off_t Nsubset, off_t *Nmatch);
    9796int SubmitSpectrums (Spectrum *spectrum);
    9897void set_timezone (double dt);
    … …  
    10099void showinfo (Spectrum *spec);
    101100int escape (int mode, char *message);
    102 int set_spectra (Spectrum *new, int Nnew);
    103 Spectrum *get_spectra (int *N);
     101int set_spectra (Spectrum *new, off_t Nnew);
     102Spectrum *get_spectra (off_t *N);
    104103
    105104void ConfigInitSpec (int *argc, char **argv);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/convert.c

    r3536 r27305  
    22# include "photreg.h"
    33
    4 PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, int Nphotpars) {
     4PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, off_t Nphotpars) {
    55
    6   int i;
     6  off_t i;
    77  PhotPars *output;
    88

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/delete.c

    r7080 r27305  
    22# include "photreg.h"
    33
    4 void DeleteSubset (FITS_DB *db, PhotPars *photdata, int Nphotdata, int *match, int Nmatch) {
     4void DeleteSubset (FITS_DB *db, PhotPars *photdata, off_t Nphotdata, off_t *match, off_t Nmatch) {
    55
    6   int i, j;
    7   int *keep, Ndel, Nsubset;
     6  off_t i, j;
     7  off_t *keep, Ndel, Nsubset;
    88  PhotPars *subset;
    99
    10   ALLOCATE (keep, int, MAX (Nphotdata, 1));
     10  ALLOCATE (keep, off_t, MAX (Nphotdata, 1));
    1111  for (i = 0; i < Nphotdata; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %d photdata\n", Nphotdata);
     12  fprintf (stderr, "total of %lld photdata\n", (long long) Nphotdata);
    1313
    1414  Ndel = 0;
    … …  
    1919    Ndel ++;
    2020  }
    21   fprintf (stderr, "delete %d photdata\n", Ndel);
     21  fprintf (stderr, "delete %lld photdata\n", (long long) Ndel);
    2222
    2323  if (Ndel == 0) {
    … …  
    3131  Nsubset = Nphotdata - Ndel;
    3232  ALLOCATE (subset, PhotPars, MAX (1, Nsubset));
    33   fprintf (stderr, "keeping %d photdata\n", Nsubset);
     33  fprintf (stderr, "keeping %lld photdata\n", (long long) Nsubset);
    3434  for (j = i = 0; i < Nphotdata; i++) {
    3535    if (!keep[i]) continue;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/match.c

    r3536 r27305  
    22# include "photreg.h"
    33
    4 int *match_criteria (PhotPars *photdata, int Nphotdata, int *Nmatch) {
     4off_t *match_criteria (PhotPars *photdata, off_t Nphotdata, off_t *Nmatch) {
    55
    6   int i, j;
    7   int N, NMATCH;
    8   int *match;
    9   int reject;
     6  off_t i, j;
     7  off_t N, NMATCH;
     8  off_t *match;
     9  off_t reject;
    1010
    1111  /* create selection index */
    1212  N = 0;
    1313  NMATCH = 1000;
    14   ALLOCATE (match, int, NMATCH);
     14  ALLOCATE (match, off_t, NMATCH);
    1515
    1616  /* find entries that matches criteria */
    … …  
    2727    if (N == NMATCH) {
    2828      NMATCH += 1000;
    29       REALLOCATE (match, int, NMATCH);
     29      REALLOCATE (match, off_t, NMATCH);
    3030    }
    3131  }

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/output.c

    r14590 r27305  
    66
    77/* given a subset list, write out the selected images, if desired */
    8 void OutputSubset (PhotPars *photdata, int Nphotdata, int *match, int Nmatch) {
     8void OutputSubset (PhotPars *photdata, off_t Nphotdata, off_t *match, off_t Nmatch) {
    99
    1010  if (output.table != (char *) NULL) {
    … …  
    2323
    2424/* write out complete binary FITS table in format of db */
    25 void DumpFitsBintable (char *filename, PhotPars *photdata, int *match, int Nmatch) {
    26 
    27   int i, j;
     25void DumpFitsBintable (char *filename, PhotPars *photdata, off_t *match, off_t Nmatch) {
     26
     27  off_t i, j;
    2828  FILE *f;
    2929  Header header;
    … …  
    7171
    7272/** add ASCII table to autocode? **/
    73 void DumpFitsTable (char *filename, PhotPars *photdata, int *index, int Nkeep) {
     73void DumpFitsTable (char *filename, PhotPars *photdata, off_t *index, off_t Nkeep) {
    7474 
    7575  Header header, theader;
    … …  
    8080  char *startstr, *stopstr, *datestr, *line;
    8181  char *c1, *c2, *code, *photsys, *extname;
    82   int i;
     82  off_t i;
    8383  time_t tsecond;
    8484
    … …  
    196196
    197197/* Select, TimeMode are global */
    198 int PrintSubset (PhotPars *photdata, int *match, int Nmatch) {
    199  
    200   int i, j;
     198int PrintSubset (PhotPars *photdata, off_t *match, off_t Nmatch) {
     199 
     200  off_t i, j;
    201201  char *photstr, *timestr, *c1, *c2, *refcode;
    202202 

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/delete.c

    r7080 r27305  
    22# include "spreg.h"
    33
    4 void DeleteSubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch) {
     4void DeleteSubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch) {
    55
    6   int i, j;
    7   int *keep, Nbad, Nsubset;
     6  off_t i, j;
     7  off_t *keep, Nbad, Nsubset;
    88  Spectrum *subset;
    99
    10   ALLOCATE (keep, int, MAX (Nspectrum, 1));
     10  ALLOCATE (keep, off_t, MAX (Nspectrum, 1));
    1111  for (i = 0; i < Nspectrum; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %d spectra\n", Nspectrum);
     12  fprintf (stderr, "total of %lld spectra\n", (long long) Nspectrum);
    1313
    1414  Nbad = 0;
    … …  
    1919    Nbad ++;
    2020  }
    21   fprintf (stderr, "delete %d spectra\n", Nbad);
     21  fprintf (stderr, "delete %lld spectra\n", (long long) Nbad);
    2222  if (Nbad == 0) {
    2323    fprintf (stderr, "SUCCESS\n");
    … …  
    2828  Nsubset = Nspectrum - Nbad;
    2929  ALLOCATE (subset, Spectrum, MAX (1, Nsubset));
    30   fprintf (stderr, "keeping %d spectra\n", Nsubset);
     30  fprintf (stderr, "keeping %lld spectra\n", (long long) Nsubset);
    3131  for (j = i = 0; i < Nspectrum; i++) {
    3232    if (!keep[i]) continue;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/match.c

    r3509 r27305  
    22# include "spreg.h"
    33
    4 int *match_criteria (Spectrum *spectrum, int Nspectrum, int *Nmatch) {
     4off_t *match_criteria (Spectrum *spectrum, off_t Nspectrum, off_t *Nmatch) {
    55
    6   int i, j;
    7   int N, NMATCH;
    8   int *match;
    9   int reject;
    10   int Nfilename, Nobject, Ntelescope, Ninstrument;
     6  off_t i, j;
     7  off_t N, NMATCH;
     8  off_t *match;
     9  off_t reject;
     10  off_t Nfilename, Nobject, Ntelescope, Ninstrument;
    1111
    1212  /* create selection index */
    1313  N = 0;
    1414  NMATCH = 1000;
    15   ALLOCATE (match, int, NMATCH);
     15  ALLOCATE (match, off_t, NMATCH);
    1616
    1717  Nfilename = Nobject = Ntelescope = Ninstrument = 0;
    … …  
    4242    if (N == NMATCH) {
    4343      NMATCH += 1000;
    44       REALLOCATE (match, int, NMATCH);
     44      REALLOCATE (match, off_t, NMATCH);
    4545    }
    4646  }
    … …  
    5151# if (0)
    5252
    53 int *match_spectra (Spectrum *subset, int Nsubset, int *Nmatch) {
     53off_t *match_spectra (Spectrum *subset, off_t Nsubset, off_t *Nmatch) {
    5454 
    55   int i, j, N, Nspectrum, Nfound;
    56   int *match;
     55  off_t i, j, N, Nspectrum, Nfound;
     56  off_t *match;
    5757  Spectrum *spectrum;
    5858
    … …  
    6060
    6161  /* find matching spectra - very inefficient : sort by obstime, find those first? */
    62   ALLOCATE (match, int, Nsubset);
     62  ALLOCATE (match, off_t, Nsubset);
    6363  for (j = 0; j < Nsubset; j++) {
    6464    match[j] = -1;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/modify.c

    r7080 r27305  
    22# include "spreg.h"
    33
    4 void ModifySubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch) {
     4void ModifySubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch) {
    55
    6   int i, j, Nold;
     6  off_t i, j, Nold;
    77  char *tmppath;
    88

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/output.c

    r14590 r27305  
    1414
    1515/* given a subset list, write out the selected spectra, if desired */
    16 void OutputSubset (Spectrum *spectrum, int Nspectra, int *match, int Nmatch) {
     16void OutputSubset (Spectrum *spectrum, off_t Nspectra, off_t *match, off_t Nmatch) {
    1717
    1818  if (output.table != (char *) NULL) {
    … …  
    2929
    3030/* write out complete binary FITS table in format of db */
    31 void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch) {
     31void DumpFitsBintable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch) {
    3232
    33   int i, j;
     33  off_t i, j;
    3434  FILE *f;
    3535  Header header;
    … …  
    7272
    7373/* write out an ASCII table */
    74 void DumpFitsTable (char *filename, Spectrum *spectrum, int *match, int Nmatch) {
     74void DumpFitsTable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch) {
    7575 
    76   int i;
     76  off_t i;
    7777  char *obsstr, *regstr, *line, *datestr;
    7878  time_t tsecond;
    … …  
    141141
    142142/* Select, TimeMode are global */
    143 int PrintSubset (Spectrum *spectrum, int *match, int Nmatch) {
     143int PrintSubset (Spectrum *spectrum, off_t *match, off_t Nmatch) {
    144144 
    145   int i, j;
     145  off_t i, j;
    146146  char *timestr;
    147147
    … …  
    153153
    154154    /* predefined subset of values */
    155     fprintf (stdout, "%5d %20s %s %s %s %s ", i, timestr, spectrum[i].pathname, spectrum[i].filename, spectrum[i].objname, spectrum[i].telescope);
     155    fprintf (stdout, "%5lld %20s %s %s %s %s ", (long long) i, timestr, spectrum[i].pathname, spectrum[i].filename, spectrum[i].objname, spectrum[i].telescope);
    156156    fprintf (stdout, "%5.1f %5.3f %.1f %.1f %.2f\n", spectrum[i].exptime, spectrum[i].airmass, spectrum[i].Ws, spectrum[i].We, spectrum[i].dW);
    157157
    … …  
    161161}
    162162
    163 int dump_data (Spectrum *spectrum, int Nspectrum) {
     163int dump_data (Spectrum *spectrum, off_t Nspectrum) {
    164164
    165   int i;
     165  off_t i;
    166166
    167167  for (i = 0; i < Nspectrum; i++) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/unique.c

    r16045 r27305  
    22# include "spreg.h"
    33
    4 void sortstr (char **S, int *X, int N) {
     4void sortstr (char **S, off_t *X, off_t N) {
    55
    66# define SWAPFUNC(A,B){ \
    77  char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
    8   int  itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
     8  off_t  itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
    99}
    1010# define COMPARE(A,B)(strcmp(S[A], S[B]) < 0)
    … …  
    1818
    1919/* input is a subset index of spectrum list, output is a new subset */
    20 int *unique_entries (Spectrum *spectrum, int Nspectrum, int *subset, int *Nmatch) {
     20off_t *unique_entries (Spectrum *spectrum, off_t Nspectrum, off_t *subset, off_t *Nmatch) {
    2121
    22   int i, j, m, Nsubset;
    23   int N, NMATCH;
    24   int *match, *entry;
     22  off_t i, j, m, Nsubset;
     23  off_t N, NMATCH;
     24  off_t *match, *entry;
    2525  char idxline[128];
    2626  char **index;
    … …  
    3131  N = 0;
    3232  NMATCH = 1000;
    33   ALLOCATE (match, int, NMATCH);
     33  ALLOCATE (match, off_t, NMATCH);
    3434
    3535  Nsubset = *Nmatch;
    … …  
    3737  /* index = filename */
    3838  ALLOCATE (index, char *, Nsubset);
    39   ALLOCATE (entry, int, Nsubset);
     39  ALLOCATE (entry, off_t, Nsubset);
    4040  for (i = 0; i < Nsubset; i++) {
    4141    sprintf (idxline, "%s", spectrum[subset[i]].filename);
    … …  
    5555    if (N == NMATCH) {
    5656      NMATCH += 1000;
    57       REALLOCATE (match, int, NMATCH);
     57      REALLOCATE (match, off_t, NMATCH);
    5858    }
    5959

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/convertimreg.c

    r7080 r27305  
    88  Header header;
    99  RegImage *pimage;
    10   int i, Nimage, status, lockstate, dbstate;
    11   int *match;
     10  off_t i, Nimage, *match, status;
     11  int lockstate, dbstate;
    1212 
    1313  get_version (argc, argv, version);
    … …  
    4545  status = fread (pimage, sizeof(RegImage), Nimage, f);
    4646  if (status != Nimage) {
    47     fprintf (stderr, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
     47    fprintf (stderr, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
    4848    fclearlockfile (argv[1], f, lockstate, &dbstate);
    4949    exit (1);
    … …  
    5353
    5454  /* create complete subset */
    55   ALLOCATE (match, int, Nimage);
     55  ALLOCATE (match, off_t, Nimage);
    5656  for (i = 0; i < Nimage; i++) match[i] = i;
    5757

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/detsearch.c

    r7080 r27305  
    55int main (int argc, char **argv) {
    66 
    7   int Nmatch, Ndetrend;
     7  off_t Nmatch, Ndetrend;
    88  char *dBFile;
    99  FITS_DB db;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotmerge.c

    r27295 r27305  
    33/*** this needs to be written using dvo_image functions !!! ***/
    44
    5 Image *LoadImageTable (FILE *f, Header *header, int *nimage);
     5Image *LoadImageTable (FILE *f, Header *header, off_t *nimage);
    66static char *version = "imphotcopy $Revision: 1.6 $";
    77
    88int main (int argc, char **argv) {
    99 
     10  int N, Ntimes;
    1011  off_t status, Nimage;
     12  off_t i, j, Ninput, *index;
    1113  Header header, theader;
    1214  Image *image, *input;
    1315  FILE *f, *g;
    14   int i, j, N;
    1516  char *dBFile;
    16   int Ninput, *index, Ntimes;
    1717  time_t *tstart, *tstop;
    1818  int VERBOSE, PHOTCODE, dbstate;
    … …  
    9292  /* allocate space for reference lists */
    9393  Nin = 0;
    94   ALLOCATE (index, int, Ninput);
     94  ALLOCATE (index, off_t, Ninput);
    9595 
    9696  /* these filters are applied to input NOT image */
    … …  
    159159  size = Nimage*sizeof(Image) + header[0].datasize;
    160160  if (size != filestatus.st_size) {
    161     Ndata = (filestatus.st_size - header[0].size) / sizeof (Image);
     161    Ndata = (filestatus.st_size - header[0].datasize) / sizeof (Image);
    162162    fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
    163     fprintf (stderr, "header: %d, data: %d\n", Nimage, Ndata);
     163    fprintf (stderr, "header: %lld, data: %lld\n", (long long) Nimage, (long long) Ndata);
    164164    Nimage = Ndata;
    165165  }

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotsearch.c

    r7080 r27305  
    66int main (int argc, char **argv) {
    77 
    8   int Nmatch, Nimage;
    9   int *match;
     8  off_t Nmatch, Nimage;
     9  off_t *match;
    1010  Image *image;
    1111  FITS_DB db;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregister.c

    r7080 r27305  
    55int main (int argc, char **argv) {
    66 
    7   int Nregimage;
     7  off_t Nregimage;
    88  RegImage *image, *regimage;
    99  FITS_DB db;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregtable.c

    r7080 r27305  
    55int main (int argc, char **argv) {
    66 
    7   int Nimage;
     7  off_t Nimage;
    88  char *infile;
    99  RegImage *image;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imsearch.c

    r7080 r27305  
    55int main (int argc, char **argv) {
    66 
    7   int Nmatch, Nimage, *match;
     7  off_t Nmatch, Nimage, *match;
    88  RegImage *image;
    99  FITS_DB db;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imstatreg.c

    r7080 r27305  
    55int main (int argc, char **argv) {
    66 
    7   int i, child;
    8   int *match, Nmatch, Nimage, Nsubset;
     7  int child;
     8  off_t i, *match, Nmatch, Nimage, Nsubset;
    99  FILE *f;
    1010  RegImage *image, *subset;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/photsearch.c

    r7080 r27305  
    66
    77  char *filename;
    8   int Nmatch, Nphotpars;
    9   int *match;
     8  off_t Nmatch, Nphotpars;
     9  off_t *match;
    1010  FITS_DB db;
    1111  PhotPars *photpars;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/spsearch.c

    r7080 r27305  
    55int main (int argc, char **argv) {
    66 
    7   int Nmatch, Nspectrum, *match;
     7  off_t Nmatch, Nspectrum, *match;
    88  Spectrum *spectrum;
    99  FITS_DB db;

  • branches/eam_branches/largefiles.20100314/Ohana/src/libohana/include/ohana_sort.h

    r16040 r27305  
    7070void dsortpair (double *X, double *Y, int N);
    7171void isortpair (int *X, int *Y, int N);
     72void llsortpair (off_t *X, off_t *Y, off_t N);
    7273void fsortthree (float *X, float *Y, float *Z, int N);
    7374void dsortthree (double *X, double *Y, double *Z, int N);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libohana/src/sorts.c

    r16040 r27305  
    7373}
    7474
     75// sort two int vectors by first vector
     76void llsortpair (off_t *X, off_t *Y, off_t N) {
     77
     78# define SWAPFUNC(A,B){ off_t tmp; \
     79  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
     80  tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
     81}
     82# define COMPARE(A,B)(X[A] < X[B])
     83
     84  OHANA_SORT (N, COMPARE, SWAPFUNC);
     85
     86# undef SWAPFUNC
     87# undef COMPARE
     88
     89}
     90
    7591void fsortthree (float *X, float *Y, float *Z, int N) {
    7692

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/elliprofile.c

    r25757 r27305  
    33int elliprofile (int argc, char **argv) {
    44 
    5   int i, ix, iy, Nx, Ny, N, center;
     5  int i, ix, iy, Nx, Ny;
    66  float *in;
    7   double Rmaj, Rmin, phi, alpha, Io, ARatio;
     7  double Rmaj, Rmin, phi;
    88  double root1, root2, R, A1, A2, A3;
    99  double Sx, Sy, Sxy;
    10   double x, y, r, f, Xo, Yo;
     10  double x, y, Xo, Yo;
    1111  Buffer *buf;
    1212  Vector *rvec, *fvec;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galprofiles.c

    r25757 r27305  
    55int galprofiles (int argc, char **argv) {
    66 
    7   int i, j, Nx, Ny, N, Nsec, NELEMENTS;
     7  int i, Nx, Ny, N, Nsec, NELEMENTS;
    88  float *in;
    99  double theta, dtheta, x, y, Xo, Yo, r, Rmax, value;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradbins.c

    r25757 r27305  
    1212 
    1313  int i, Nbin;
    14   double Rmin, Rmax;
     14  double Rmax;
    1515  Vector *fvec, *rvec, *Fvec, *Rvec, *Avec;
    1616

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradius.c

    r25757 r27305  
    66int galradius (int argc, char **argv) {
    77 
    8   int i, j, Nx, Ny, N, Nsec, NELEMENTS, Rbin, Nout, above;
    9   double theta, dtheta, x, y, Xo, Yo, r, Rmax, Rmin, value;
     8  int i, j, N, Rbin, Nout, above;
     9  double Rmax, Rmin;
    1010  double Fmin, Fmax, dF, Fm, Fp, Fo, Rsum, Rnpt, Ro;
    1111  opihi_flt *flux, *radius, *values;
    12   Buffer *buf;
    13   Vector *fvec, *rvec, *tvec, *Fvec, *Rvec;
    14   char name[128];
     12  Vector *fvec, *rvec, *Fvec, *Rvec;
    1513
    1614  if (argc != 5) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/petrosian.c

    r25757 r27305  
    44 
    55  int i, above;
    6   float *in;
    76  double Fsum, Asum, Area, R_90, rad_90, flux_90;
    87  Vector *rvec, *avec, *fvec, *Rvec, *Fvec, *Svec, *Avec;
    … …  
    4039  ResetVector (Avec, OPIHI_FLT, fvec[0].Nelements);
    4140
     41  R_90 = 0.1;
    4242  above = TRUE;
    4343  Fsum = 0.0;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/region.c

    r25757 r27305  
    33int region (int argc, char **argv) {
    44 
    5   char string[256];
    65  double Ra, Dec, Radius;
    76  float dx, dy;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.basic/inthash.c

    r25965 r27305  
    33int inthash (int argc, char **argv) {
    44
    5   int i, N, modulus, value, input;
     5  int N, modulus, value, input;
    66  char *varName;
    77

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/dbconnect.c

    r14590 r27305  
    4747    gprint (GP_ERR, "failed to set interactive timout\n");
    4848    gprint (GP_ERR, "%s\n", mysql_error (connection));
    49     free (query);
    5049    return (FALSE);
    5150  }
    … …  
    5756    gprint (GP_ERR, "failed to set wait timout\n");
    5857    gprint (GP_ERR, "%s\n", mysql_error (connection));
    59     free (query);
    6058    return (FALSE);
    6159  }
    … …  
    7169    gprint (GP_ERR, "failed to get timout\n");
    7270    gprint (GP_ERR, "%s\n", mysql_error (connection));
    73     free (query);
    7471    return (FALSE);
    7572  }
    … …  
    8481    gprint (GP_ERR, "failed to get timout\n");
    8582    gprint (GP_ERR, "%s\n", mysql_error (connection));
    86     free (query);
    8783    return (FALSE);
    8884  }

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/relocate.c

    r25757 r27305  
    33int relocate (int argc, char **argv) {
    44
    5   char *end;
    65  int x, y;
    76  int N, kapa;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageOps.c

    r19823 r27305  
    11# include "dvoshell.h"
    22
    3 void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset,
     3void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset,
    44                   SkyRegionSelection *selection,
    55                   unsigned long int tzero, double trange, int TimeSelect)
    66{
    77
    8   int i, j, flipped, status, InPic;
    9   int *subset;
    10   int N, n, npts;
     8  int j, flipped, status, InPic;
     9  off_t i, n, *subset;
     10  int npts;
    1111  double r, d, X, Y, x[4], y[4], Rmin, Rmax, Rmid;
    1212  Graphdata graph;
    … …  
    4444
    4545  npts = 200;
    46   ALLOCATE (subset, int, npts);
    47   n = N = 0;
     46  ALLOCATE (subset, off_t, npts);
     47  n = 0;
    4848  for (i = 0; i < Nimage; i++) {
    4949    if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue;
    … …  
    114114    if (n > npts - 1) {
    115115      npts += 200;
    116       REALLOCATE (subset, int, npts);
     116      REALLOCATE (subset, off_t, npts);
    117117    }
    118118  }
    119119
    120   REALLOCATE (subset, int, MAX (n, 1));
     120  REALLOCATE (subset, off_t, MAX (n, 1));
    121121  *Subset = subset;
    122122  *Nsubset = n;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageSelection.c

    r14590 r27305  
    33/* db image table */
    44static Image *image = NULL;
    5 static int *subset = NULL;
    6 static int Nimage = 0;
    7 static int Nsubset = 0;
     5static off_t *subset = NULL;
     6static off_t Nimage = 0;
     7static off_t Nsubset = 0;
    88static Coords mosaic;
    99

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/LoadImages.c

    r15752 r27305  
    11# include "dvoshell.h"
    22
    3 Image *LoadImages (int *nimage) {
     3Image *LoadImages (off_t *Nimage) {
    44
    55  int status;
    … …  
    2525    gprint (GP_ERR, "note: image catalog is empty\n");
    2626    ALLOCATE (image, Image, 1);
    27     *nimage = 1;
     27    *Nimage = 1;
    2828    return (image);
    2929  }
    … …  
    3737  }
    3838
    39   image = gfits_table_get_Image (&db.ftable, nimage, &db.swapped);
     39  image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped);
    4040  return (image);
    4141}

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/Makefile

    r25757 r27305  
    2626$(SRC)/compare.$(ARCH).o                \
    2727$(SRC)/match_image.$(ARCH).o            \
    28 $(SRC)/photometry.$(ARCH).o             \
    2928$(SRC)/dvomisc.$(ARCH).o                \
    3029$(SRC)/region_list.$(ARCH).o            \
     30$(SRC)/photometry.$(ARCH).o             \
    3131$(SRC)/dbBooleanCond.$(ARCH).o          \
    3232$(SRC)/dbCheckStack.$(ARCH).o           \

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/avextract.c

    r24233 r27305  
    33int avextract (int argc, char **argv) {
    44 
    5   int i, j, n, m, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     5  off_t i, j, n, m;
     6  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    67  int Nsecfilt, mode, VERBOSE;
    78  char **cstack, name[1024];
    … …  
    7980
    8081  /* create output storage vectors */
     82  Npts = 0;
     83  NPTS = 100;
    8184  ALLOCATE (values, dbValue, Nfields);
    8285  ALLOCATE (vec, Vector *, Nreturn);
    … …  
    9093    ResetVector (vec[i], fields[i].type, NPTS);
    9194  }
    92 
    93   Npts = 0;
    94   NPTS = 1;
    9595
    9696  // grab data from all selected sky regions

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/badimages.c

    r7917 r27305  
    88int badimages (int argc, char **argv) {
    99 
    10   int i, Nimage, entry, First, Cross;
     10  off_t i, Nimage;
     11  int entry, First, Cross;
    1112  float *ptr;
    1213  double nominal, big, small, value;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calextract.c

    r15509 r27305  
    55int calextract (int argc, char **argv) {
    66 
    7   int i, N, Nr, mode[2];
    8   int Nsecfilt, NSTAR;
     7  off_t i, Nr;
     8  int Nsecfilt, NSTAR, N, mode[2];
    99
    1010  PhotCode *code[2];

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calmextract.c

    r20936 r27305  
    66int calmextract (int argc, char **argv) {
    77 
    8   int i, k, N, Nr, mode[2];
    9   int NSTAR, Nstar, Nsecfilt;
     8  off_t i, k, Nr;
     9  int NSTAR, Nstar, Nsecfilt, N, mode[2];
    1010
    1111  Catalog catalog;
    … …  
    169169int ConcatMeasures (Vector *vec, PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int Nin, int param) {
    170170
    171   int i, Ns, N;
     171  off_t i, N;
     172  int Ns;
    172173  double *value;
    173174

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ccd.c

    r20936 r27305  
    44 
    55  double *M1, *M2;
    6   int i, m, k, Npts, NPTS, N;
    7   int N1, N2, i1, i2, mode[4];
     6  off_t i, m, k, N1, N2, i1, i2;
     7  int Npts, NPTS, N;
     8  int mode[4];
    89  int Nsecfilt, KeepNulls;
    910  void *Signal;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmd.c

    r20936 r27305  
    44 
    55  double *M1, *M3;
    6   int i, j, m, i1, i3, N1, N3, N;
     6  off_t i, j, m, N1, N3, i1, i3;
     7  int N;
    78  int Npts, NPTS, mode[3];
    89  int Nsecfilt, KeepNulls;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpReadFile.c

    r12840 r27305  
    44# define BLOCK 1000
    55
    6 CMPstars *cmpReadFits (FILE *f, int *nstars) {
     6CMPstars *cmpReadFits (FILE *f, off_t *nstars) {
    77
    8   int i, Nstars;
     8  off_t i, Nstars;
    99  Header theader;
    1010  FTable table;
    … …  
    4444}
    4545
    46 CMPstars *cmpReadText (FILE *f, int *nstars) {
     46CMPstars *cmpReadText (FILE *f, off_t *nstars) {
    4747
    48   int j, N, Nextra, Ninstar, Nskip, Nbytes, nbytes;
     48  off_t N;
     49  int j, Nextra, Ninstar, Nskip, Nbytes, nbytes;
    4950  int done;
    5051  char *buffer, *c, *c2;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpread.c

    r27295 r27305  
    66int cmpread (int argc, char **argv) {
    77 
    8   off_t Nbytes;
    9   int i, field, Naxis, Nstars;
     8  off_t i, Nbytes, Nstars;
     9  int field, Naxis;
    1010  double tR, tD;
    1111  float value;
    … …  
    6565
    6666  /* find expected number of stars */
    67   if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
     67  if (!gfits_scan (&header, "NSTARS", "%lld", 1, &Nstars)) {
    6868    gprint (GP_ERR, "ERROR: can't get NSTARS from header\n");
    6969    gfits_free_header (&header);
    … …  
    7777    /* allocate space for stars */
    7878    gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]);
    79     if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
     79    if (!gfits_scan (&header, "NSTARS", "%lld", 1, &Nstars)) {
    8080      gprint (GP_ERR, "ERROR: failed to find NSTARS\n");
    8181      exit (1);
    … …  
    139139  free (stars);
    140140  gfits_free_header (&header);
    141   gprint (GP_ERR, "loaded %d objects\n", Nstars);
     141  gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars);
    142142  return (TRUE);
    143143}

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/compare.c

    r20936 r27305  
    55              Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius) {
    66
    7   int i, j, first_j, Nmatch, NMATCH;
     7  off_t i, j, first_j, Nmatch, NMATCH;
    88  double dX, dY, dR;
    99

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractAverages.c

    r21508 r27305  
    4242dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
    4343
    44   int i, Nsec;
     44  off_t i;
     45  int Nsec;
    4546  dbValue value;
    4647

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractImages.c

    r21508 r27305  
    5454
    5555/* return image.field based on the selection */
    56 dbValue dbExtractImages (Image *image, int Nimage, int N, dbField *field) {
     56dbValue dbExtractImages (Image *image, off_t Nimage, off_t N, dbField *field) {
    5757
    5858  double x, y;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/detrend.c

    r27295 r27305  
    77 
    88  FILE *f;
    9   int i, Nimage, status, N, TimeSelect;
     9  off_t i, Nimage, status;
     10  int N, TimeSelect;
    1011  char DataBase[256];
    1112  time_t tzero, tend;
    … …  
    136137
    137138  /* load existing data from database */
    138   gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     139  gfits_scan (&header, "NIMAGES", "%lld", 1, &Nimage);
    139140  ALLOCATE (pimage, RegImage, Nimage);
    140141  status = fread (pimage, sizeof(RegImage), Nimage, f);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dmt.c

    r14590 r27305  
    1010# if (0)
    1111
    12   int i, m, k, N, kapa, SaveVectors;
    13   int Nsec, Nsecfilt, NPTS;
     12  int kapa, SaveVectors;
     13  int Nsec, Nsecfilt;
     14  off_t i, m, k, N, NPTS;
    1415  double Radius;
    1516  float dt1, dt2, dmt1, dmt2;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dvomisc.c

    r16040 r27305  
    11# include "dvoshell.h"
    22
    3 void cprecess (Average *average, int Naverage, double in_epoch, double out_epoch) {
     3void cprecess (Average *average, off_t Naverage, double in_epoch, double out_epoch) {
    44
    5   int i;
     5  off_t i;
    66  double T;
    77  double A, D, RA, DEC, zeta, z, theta;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitcolors.c

    r20936 r27305  
    1010 
    1111  int *list, Nlist;
    12   int i, k, m, N, NP1, NP2, NP, Np, Npts, NPTS;
    13   int N1, N2, i1, i2, mode[4];
     12  off_t i, k, m, N1, N2, i1, i2;
     13  int N, NP1, NP2, NP, Np, Npts, NPTS;
     14  int mode[4];
    1415  int Nsecfilt, status;
    1516  void *oldsignal;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitsed.c

    r16810 r27305  
    2424 
    2525  int *hashcode;
    26   int i, j, k, m, N, done, Nfit;
     26  off_t i, j, k, m;
     27  int N, done, Nfit;
    2728  int Nsecfilt, status;
    2829  void *oldsignal;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gimages.c

    r27024 r27305  
    55int gimages (int argc, char **argv) {
    66 
    7   int i, j, N, Nimage, Nfound, *subset, Nsubset, status;
     7  off_t i, j, Nimage, *subset, Nsubset;
     8  int N, Nfound, status;
    89  double ra, dec, Ra, Dec, X, Y, Yo;
    910  double trange, t;
    … …  
    114115    {
    115116      Coords local;
    116       double Ro, Do, Xo, Yo, Xs, Ys, Xe, Ye, Radius;
     117      double Ro, Do, Xo, Yo, Xs, Ys, Radius;
    117118     
    118119      if (typehash == DistortImage) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gstar.c

    r27295 r27305  
    1212  double *RA, *DEC;
    1313  off_t i, Nstars, *N1;
    14   int j, k, m, N, Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST;
    15   int found, GetMeasures, Nlo, Nhi;
     14  off_t j, k, m, N, Nlo, Nhi;
     15  int Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST;
     16  int found, GetMeasures;
    1617  int SaveVectors;
    1718  Vector *vec1, *vec2, *vec3, *vec4, *vec5, *vec6;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/images.c

    r20936 r27305  
    1111int images (int argc, char **argv) {
    1212
    13   int i, j, Nimage, status, InPic, leftside, *plist, TimeSelect, ByName;
     13  off_t i, Nimage;
     14  int j, status, InPic, leftside, *plist, TimeSelect, ByName;
    1415  int WITH_MOSAIC, SOLO_MOSAIC, HIDDEN;
    1516  time_t tzero, tend;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdense.c

    r20936 r27305  
    55 
    66  long A, B;
    7   int i, kapa, N, Nimage, status, NPTS;
     7  off_t i, Nimage;
     8  int kapa, N, status, NPTS;
    89  double r, d, x, y, Rmin, Rmax;
    910  Vector Xvec, Yvec;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imextract.c

    r20936 r27305  
    33int imextract (int argc, char **argv) {
    44 
    5   // int *subset, Nsubset;  -- not sure if we need to use this or not...
    6 
    7   int i, j, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    8   int Nimage, VERBOSE;
     5  off_t i, j, Nimage;
     6  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     7  int VERBOSE;
    98  char **cstack, name[1024];
    109  void *Signal;
    … …  
    7372
    7473  /* create output storage vectors */
     74  Npts = 0;
     75  NPTS = 100;
    7576  ALLOCATE (values, dbValue, Nfields);
    7677  ALLOCATE (vec, Vector *, Nreturn);
    … …  
    8485    ResetVector (vec[i], fields[i].type, NPTS);
    8586  }
    86 
    87   Npts = 0;
    88   NPTS = 1;
    8987
    9088  if ((image = LoadImages (&Nimage)) == NULL) goto escape;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imlist.c

    r17248 r27305  
    33int imlist (int argc, char **argv) {
    44 
    5   int i, j, N, Nimage, *subset, Nsubset, TimeSelect, RegionSelect, TimeFormat, NameSelect;
     5  off_t i, j, Nimage, *subset, Nsubset;
     6  int N, TimeSelect, RegionSelect, TimeFormat, NameSelect;
    67  int PhotcodeSelect;
    78  time_t tzero, TimeReference;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imphot.c

    r14590 r27305  
    66  double trange;
    77  int N, GreyScale;
    8   int i, j, Nimage, Nsubset, *subset;
     8  off_t i, j, Nimage, Nsubset, *subset;
    99  char bufname[64];
    1010  float *p;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c

    r27295 r27305  
    11# include "dvoshell.h"
    2 RegImage *load_imreg (char *DataBase, int *nimage);
     2RegImage *load_imreg (char *DataBase, off_t *nimage);
    33
    44# define NVALUE 22
    … …  
    88int imrough (int argc, char **argv) {
    99 
    10   int i, N, Nimage, TimeSelect;
     10  off_t i, Nimage;
     11  int N, TimeSelect;
    1112  int ModeSelect, TypeSelect, CCDSelect, FilterSelect, TimeFormat;
    1213  int type, value, mode, CCD, NVEC;
    … …  
    231232}
    232233
    233 RegImage *load_imreg (char *DataBase, int *nimage) {
    234 
    235   int Nimage, status;
     234RegImage *load_imreg (char *DataBase, off_t *nimage) {
     235
     236  off_t Nimage;
     237  int status;
    236238  char line[80];
    237239  FILE *f;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imstats.c

    r20936 r27305  
    33int imstats (int argc, char **argv) {
    44 
    5   int i, kapa, Nimage, N;
     5  off_t i, Nimage;
     6  int kapa, N;
    67  int Mcal, AutoLimits;
    78  double r, d;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/match_image.c

    r12332 r27305  
    11# include "dvoshell.h"
    22
    3 int match_image (Image *image, int Nimage, unsigned int T, short int S) {
     3off_t match_image (Image *image, off_t Nimage, unsigned int T, short int S) {
    44
    5   int N, Nlo, Nhi, N1, N2;
     5  off_t N, Nlo, Nhi, N1, N2;
    66
    77  /* bracket first value of interest */
    … …  
    3737}
    3838
    39 int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S) {
     39off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S) {
    4040
    41   int N, Nlo, Nhi, N1, N2;
     41  off_t N, Nlo, Nhi, N1, N2;
    4242
    4343  /* bracket first value of interest */

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/paverage.c

    r21508 r27305  
    55 
    66  FILE *f;
    7   int i, j, kapa, Narg, Npts, NPTS, status, VERBOSE;
     7  off_t i, j;
     8  int kapa, Narg, Npts, NPTS, status, VERBOSE;
    89  int Nsecfilt, Nsec, Nloaded;
    910  double Mz, Mr, mag;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/photometry.c

    r25757 r27305  
    555555
    556556/* extract a list of measure parameters from the specified average entry based on the pre-set selections */
    557 double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    558 
    559   int i, Nlist, NLIST;
     557double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
     558
     559  off_t i, Nlist, NLIST;
    560560  double M, *list;
    561561 
    … …  
    585585double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) {
    586586
    587   int i;
     587  off_t i;
    588588  double value;
    589589
    … …  
    714714
    715715  double frac;
    716   int k, Nc, Nt;
     716  int Nc, Nt;
     717  off_t k;
    717718 
    718719  Nt = Nc = 0;
    … …  
    730731int DetermineTypeCode (Average *average, Measure *measure, int code) {
    731732
    732   int k, N, Nt[3];
     733  off_t k;
     734  int N, Nt[3];
    733735 
    734736  Nt[0] = Nt[1] = Nt[2] = 0;
    … …  
    788790int TestAverage (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) {
    789791
    790   int i, Nm, Type, Select;
     792  off_t i, Nm;
     793  int Type, Select;
    791794  double fwhm, typefrac, dM, Xm;
    792795
    … …  
    937940
    938941
    939 double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n) {
     942double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n) {
    940943 
    941944  double *M, mag;
    942   int N;
     945  off_t N;
    943946
    944947  if ((mode == MAG_AVE) || (mode == MAG_REF)) {
    … …  
    960963
    961964/* extract delta-mag pairs applying specified selections */
    962 double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) {
    963 
    964   int i, j, A1, A2, N1, N2, Np, Nlist, NLIST;
     965double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) {
     966
     967  int A1, A2;
     968  off_t i, j, N1, N2, Np, Nlist, NLIST;
    965969  double *M1, *M2, *list;
    966970
    … …  
    10091013/* extract a list of delta-measure-mags from the specified average entry based on the
    10101014   pre-set selections - does not return self-matched measurements */
    1011 double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) {
    1012 
    1013   int i, j, Np0, Np1, Nlist, NLIST;
     1015double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) {
     1016
     1017  int Np0, Np1;
     1018  off_t i, j, Nlist, NLIST;
    10141019  double *list, M1, M2;
    10151020 
    … …  
    10561061
    10571062/* extract a measurement list matching the number of dmag entries */
    1058 double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    1059 
    1060   int A1, A2, N1;
     1063double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
     1064
     1065  off_t N1;
     1066  int A1, A2;
    10611067  double *list;
    10621068
    … …  
    10801086 
    10811087/* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections */
    1082 double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    1083 
    1084   int i, j, n, Nlist, NLIST;
     1088double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
     1089
     1090  off_t i, j, n, Nlist, NLIST;
    10851091  double *list, M1, M2;
    10861092 

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/skycoverage.c

    r27262 r27305  
    66
    77  int WITH_MOSAIC, SOLO_MOSAIC;
    8   int i, N, Nimage, status, TimeSelect, ByName, xs, ys;
     8  off_t i, Nimage;
     9  int N, status, TimeSelect, ByName, xs, ys;
    910  time_t tzero, tend;
    1011  double pixscale, dX, dY, Npts, r, d, Xi, Yi, Xs, Ys, x[2], y[2], trange, RaCenter, DecCenter;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/data.h

    r26891 r27305  
    7777/* in fft.c */
    7878void fft1D (float *dataRe, float *dataIm, int N, int Nbit, int forward);
    79 int fftND (float *dataRe, float *dataIm, int Ndim, int *Nsize, int forward);
     79int fftND (float *dataRe, float *dataIm, int Ndim, off_t *Nsize, int forward);
    8080void dfft1D (double *dataRe, double *dataIm, int N, int Nbit, int forward);
    8181int dfftND (double *dataRe, double *dataIm, int Ndim, int *Nsize, int forward);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/dvoshell.h

    r26285 r27305  
    260260double        DetermineTypefrac     PROTO((Average *average, Measure *measure, PhotCode *code));
    261261double        ExtractAverages       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param));
    262 double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    263 double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
    264 double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n));
    265 double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    266 double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    267 double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
     262double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     263double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
     264double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n));
     265double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     266double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     267double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
    268268void          FreeImageSelection    PROTO((void));
    269269void          FreeImageSelection    PROTO((void));
    … …  
    280280void          FreeDVO               PROTO((void));
    281281int           InitPhotcodes         PROTO((void));
    282 Image        *LoadImages            PROTO((int *Nimage));
     282Image        *LoadImages            PROTO((off_t *Nimage));
    283283Image        *MatchImage            PROTO((unsigned int time, short int source));
    284284Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
    … …  
    300300int           TestPhotSelections    PROTO((PhotCode **code, int *mode, int param));
    301301void          compare               PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius));
    302 void          cprecess              PROTO((Average *average, int Naverage, double in_epoch, double out_epoch));
    303 void          image_subset          PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
    304 int           match_image           PROTO((Image *image, int Nimage, unsigned int T, short int S));
    305 int           match_image_subset    PROTO((Image *image, int *subset, int Nsubset, unsigned int T, short int S));
     302void          cprecess              PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch));
     303void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
     304off_t         match_image           PROTO((Image *image, off_t Nimage, unsigned int T, short int S));
     305off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S));
    306306void          print_value           PROTO((double value, short int ival));
    307 void          sort_image_subset     PROTO((Image *image, int *subset, int N));
    308 void          sort_images           PROTO((Image *image, int N));
    309 void          sortave               PROTO((Average *ave, int N));
    310 CMPstars     *cmpReadFits           PROTO((FILE *f, int *nstars));
    311 CMPstars     *cmpReadText           PROTO((FILE *f, int *nstars));
     307CMPstars     *cmpReadFits           PROTO((FILE *f, off_t *nstars));
     308CMPstars     *cmpReadText           PROTO((FILE *f, off_t *nstars));
    312309int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
    313310
    … …  
    334331dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    335332dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    336 dbValue      dbExtractImages        PROTO((Image *image, int Nimage, int N, dbField *field));
     333dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
    337334
    338335void         dbInitField            PROTO((dbField *field));

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/pantasks.h

    r23530 r27305  
    269269int CheckJobsGetState (void);
    270270
    271 // void *CheckTasksThread (void *data);
    272 // void *CheckJobsThread (void *data);
    273 
    274271void CheckControllerSetState (int state);
    275272int CheckControllerGetState (void);
    … …  
    287284void CheckInputs (void);
    288285
    289 void ClientThreadLock (void);
    290 void ClientThreadUnlock (void);
    291 void CommandThreadLock (void);
    292 void CommandThreadUnlock (void);
    293 void ControlThreadLock (void);
    294 void ControlThreadUnlock (void);
    295 void JobTaskThreadLock (void);
    296 void JobTaskThreadUnlock (void);
     286void ClientLock (void);
     287void ClientUnlock (void);
     288void CommandLock (void);
     289void CommandUnlock (void);
     290void ControlLock (const char *func);
     291void ControlUnlock (const char *func);
     292void JobTaskLock (void);
     293void JobTaskUnlock (void);
    297294
    298295int InitPassword (void);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/lib.shell/gprint.c

    r27255 r27305  
    352352  // there are two strerror_r implementations; choose the right one:
    353353#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
    354   errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
    355 #else
    356354  strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
    357355  errorMsg = errorBuf;
     356#else
     357  errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
    358358#endif
    359359
    … …  
    362362  va_end (argp);
    363363
    364   gprintv (dest, "%s\n", errorMsg);
     364  gprint (dest, "%s\n", errorMsg);
    365365  return TRUE;
    366366}

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/JobOps.c

    r23563 r27305  
    7373
    7474  int i;
    75   int status;
    76   char command[1024];
    77   IOBuffer buffer;
    7875
    7976  gprint (GP_LOG, "\n");

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/ListenClients.c

    r23530 r27305  
    7070 
    7171  int i, Ncurrent, Nmax, status, Nread;
    72   char *line, log_stdout[128], log_stderr[128];
     72  char *line;
    7373  fd_set fdSet;
    7474  struct timeval timeout;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/status_server.c

    r26948 r27305  
    11# include "pantasks.h"
     2
     3int status_scheduler(void);
    24
    35int status_server (int argc, char **argv) {
    … …  
    103105}
    104106
    105 int status_scheduler() {
     107int status_scheduler(void) {
    106108 
    107109  gprint (GP_LOG, "\n");

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/thread_locks.c

    r23530 r27305  
    44static pthread_mutex_t ClientMutex = PTHREAD_MUTEX_INITIALIZER;
    55
    6 void ClientLock () {
     6void ClientLock (void) {
    77  pthread_mutex_lock (&ClientMutex);
    88}
    99
    10 void ClientUnlock () {
     10void ClientUnlock (void) {
    1111  pthread_mutex_unlock (&ClientMutex);
    1212}
    … …  
    1515static pthread_mutex_t CommandMutex = PTHREAD_MUTEX_INITIALIZER;
    1616
    17 void CommandLock () {
     17void CommandLock (void) {
    1818  //  fprintf (stderr, "command lock\n");
    1919  pthread_mutex_lock (&CommandMutex);
    2020}
    2121
    22 void CommandUnlock () {
     22void CommandUnlock (void) {
    2323  //  fprintf (stderr, "command unlock\n");
    2424  pthread_mutex_unlock (&CommandMutex);
    … …  
    2828static pthread_mutex_t ControlMutex = PTHREAD_MUTEX_INITIALIZER;
    2929
    30 void ControlLock (char *func) {
     30void ControlLock (const char *func) {
    3131  // fprintf (stderr, "control lock %s\n", func);
    3232  pthread_mutex_lock (&ControlMutex);
    3333}
    3434
    35 void ControlUnlock (char *func) {
     35void ControlUnlock (const char *func) {
    3636  // fprintf (stderr, "control unlock %s\n", func);
    3737  pthread_mutex_unlock (&ControlMutex);
    … …  
    4141static pthread_mutex_t JobTaskMutex = PTHREAD_MUTEX_INITIALIZER;
    4242
    43 void JobTaskLock () {
     43void JobTaskLock (void) {
    4444  //  fprintf (stderr, "jobtask lock\n");
    4545  pthread_mutex_lock (&JobTaskMutex);
    4646}
    4747
    48 void JobTaskUnlock () {
     48void JobTaskUnlock (void) {
    4949  //  fprintf (stderr, "jobtask unlock\n");
    5050  pthread_mutex_unlock (&JobTaskMutex);

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/GridOps.c

    r27295 r27305  
    287287
    288288  int **gotstar, **gridmeas;
    289   int i, j, k, N, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys;
     289  int i, j, k, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys;
    290290  double **A, **B, *Mjx, *Wjx;
    291291  float Msys, Mcal, Mmos, Merr, Wsys;
    … …  
    498498    gridM[i] = B[i][0];
    499499    gridS[i] = sqrt(A[i][i]);
    500     gridN[i] = N;
     500    gridN[i] = Ngood;
    501501  }
    502502

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/StarOps.c

    r25735 r27305  
    77void initMrel (Catalog *catalog, int Ncatalog) {
    88
    9   int i, j;
     9  off_t i, j;
    1010 
    1111  Nmax = 0;
    … …  
    3434int setMrel (Catalog *catalog, int Ncatalog) {
    3535
    36   int i, j, k, m, N, Nfew, Nsys, Nbad, Ncal, Nmos, Ngrid;
     36  off_t j, k, m;
     37  int i, N, Nfew, Nsys, Nbad, Ncal, Nmos, Ngrid;
    3738  float Msys, Mcal, Mmos, Mgrid;
    3839  StatType stats;
    … …  
    109110int setMrelOutput (Catalog *catalog, int Ncatalog, int mark) {
    110111
    111   int i, j, k, m, N, Nmax;
     112  int i, N;
     113  off_t j, k, m, Nmax;
    112114  float Msys, Mcal, Mmos, Mgrid;
    113115  double *list, *dlist;
    … …  
    173175int setMave (Catalog *catalog, int Ncatalog) {
    174176
    175   int i, j, k, m, Ns, Nsecfilt, N, Nmax, Nc;
     177  off_t j, k, m, Nmax;
     178  int i, Ns, Nsecfilt, N, Nc;
    176179  float Msys;
    177180  double *list, *dlist;
    … …  
    293296int setMcalOutput (Catalog *catalog, int Ncatalog) {
    294297
    295   int i, j, k, m;
     298  int i;
     299  off_t j, k, m;
    296300  float Mcal, Mmos, Mgrid;
    297301
    … …  
    380384void clean_measures (Catalog *catalog, int Ncatalog, int final) {
    381385
    382   int i, j, k, m, N, Ndel, Nave, Nmax, image_bad, TOOFEW;
    383   int *ilist;
     386  off_t j, k, m, Nmax, Ndel, Nave;
     387  int i, N, image_bad, TOOFEW;
     388  off_t *ilist;
    384389  double *tlist, *list, *dlist, Ns;
    385390  float Msys, Mcal, Mmos, Mgrid;
    … …  
    396401  ALLOCATE (list, double, MAX (1, Nmax));
    397402  ALLOCATE (dlist, double, MAX (1, Nmax));
    398   ALLOCATE (ilist, int, Nmax);
     403  ALLOCATE (ilist, off_t, Nmax);
    399404  ALLOCATE (tlist, double, Nmax);
    400405 
    … …  
    480485  }
    481486  initstats (STATMODE);
    482   if (VERBOSE) fprintf (stderr, "%d measures marked poor, %d total\n", Ndel, Nave);
     487  if (VERBOSE) fprintf (stderr, "%lld measures marked poor, %lld total\n", (long long) Ndel, (long long) Nave);
    483488  free (ilist);
    484489  free (tlist);
    … …  
    487492StatType statsStarN (Catalog *catalog, int Ncatalog) {
    488493
    489   int i, j, k, m, n, N, Ntot;
     494  off_t j, k, m, Ntot;
     495  int i, n, N;
    490496  double *list, *dlist;
    491497  float Mcal, Mmos, Mgrid;
    … …  
    533539StatType statsStarX (Catalog *catalog, int Ncatalog) {
    534540
    535   int i, j, n, Ntot, Xm;
     541  off_t j, Ntot;
     542  int i, n, Xm;
    536543  double *list, *dlist;
    537544  StatType stats;
    … …  
    568575StatType statsStarS (Catalog *catalog, int Ncatalog) {
    569576
    570   int i, j, n, Ntot;
     577  int i, n;
     578  off_t j, Ntot;
    571579  double *list, *dlist;
    572580  float dM;
    … …  
    603611void plot_stars (Catalog *catalog, int Ncatalog) {
    604612
    605   int i, j, bin;
     613  int i, bin;
     614  off_t j;
    606615  float dMrel;
    607616  double *xlist, *Mlist;
    … …  
    634643void plot_chisq (Catalog *catalog, int Ncatalog) {
    635644
    636   int i, j, N, Ntotal, value;
     645  off_t j, Ntotal;
     646  int i, N, value;
    637647  double *xlist, *ylist;
    638648  Graphdata graphdata;
    … …  
    665675void plot_star_coords (Catalog *catalog, int Ncatalog) {
    666676
    667   int i, j, N;
     677  int i;
     678  off_t j, N;
    668679  double *xlist, *ylist;
    669680  double Xmin, Ymin, Xmax, Ymax;

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/bcatalog.c

    r21508 r27305  
    33int bcatalog (Catalog *subcatalog, Catalog *catalog) {
    44 
    5   int i, j, offset, ecode;
    6   int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
     5  off_t i, j, offset;
     6  int ecode;
     7  off_t NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
    78  float mag;
    89
    … …  
    113114
    114115  if (VERBOSE) {
    115     fprintf (stderr, "%d: using %d stars (%d measures) for catalog\n", i,
    116              subcatalog[0].Naverage, subcatalog[0].Nmeasure);
     116    fprintf (stderr, "%d: using %lld stars (%lld measures) for catalog\n", i,
     117             (long long) subcatalog[0].Naverage, (long long) subcatalog[0].Nmeasure);
    117118  }
    118119  return (TRUE);

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/plot_scatter.c

    r21508 r27305  
    33void plot_scatter (Catalog *catalog, int Ncatalog) {
    44
    5   int i, j, k, m, N, Ntot;
     5  off_t i, j, k, m, N, Ntot;
    66  float Mrel, Mcal, Mmos, Mgrid;
    77  double *xlist, *ylist, *ilist;

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/relphot_objects.c

    r25757 r27305  
    33int relphot_objects () {
    44
    5   int i, j, k, m;
     5  off_t i, j, k, m;
    66  int Nsecfilt;
    77

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/select_images.c

    r21508 r27305  
    1313} SkyRegionCoords;
    1414
    15 Image *select_images (SkyList *skylist, Image *timage, int Ntimage, int **LineNumber, int *Nimage) {
     15Image *select_images (SkyList *skylist, Image *timage, off_t Ntimage, off_t **LineNumber, off_t *Nimage) {
    1616 
    1717  Image *image;
    18   int i, j, k, m, found, nimage, NIMAGE;
    19   int InRange, ecode;
     18  off_t i, j, k, m;
     19  off_t *line_number, nimage, NIMAGE;
     20  int InRange, ecode, found;
    2021  double Ri[5], Di[5], Xi[5], Yi[5], dx, dy;
    21   int *line_number;
    2222  Coords tcoords;
    2323  SkyRegionCoords *skycoords;
    … …  
    7171  NIMAGE = 100;
    7272  ALLOCATE (image, Image, NIMAGE);
    73   ALLOCATE (line_number, int, NIMAGE);
     73  ALLOCATE (line_number, off_t, NIMAGE);
    7474 
    7575  // go through the complete list of images, selecting ones which overlap any region
    … …  
    146146        NIMAGE += 100;
    147147        REALLOCATE (image, Image, NIMAGE);
    148         REALLOCATE (line_number, int, NIMAGE);
     148        REALLOCATE (line_number, off_t, NIMAGE);
    149149      }
    150150    }
    … …  
    154154
    155155  REALLOCATE (image, Image, MAX (nimage, 1));
    156   REALLOCATE (line_number, int, MAX (nimage, 1));
     156  REALLOCATE (line_number, off_t, MAX (nimage, 1));
    157157  free (skycoords);
    158158

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setExclusions.c

    r16810 r27305  
    33int setExclusions (Catalog *catalog, int Ncatalog) {
    44
    5   int i, j, k, m, Narea, Nnocal, Ngood, ecode;
     5  off_t i, j, k, m, Narea, Nnocal, Ngood;
     6  int ecode;
    67  Coords *coords;
    78  double r, d, x, y;

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setMrelFinal.c

    r26154 r27305  
    33void setMrelFinal (Catalog *catalog) {
    44
    5   int i, j, m, ecode;
     5  off_t i, j, m;
     6  int ecode;
    67
    78  /* if we reset the catalog, reset all the current measurements */
    … …  
    3940
    4041  /* set catalog[0].found[i] = FALSE */
    41   ALLOCATE (catalog[0].found, int, MAX (1, catalog[0].Naverage));
     42  ALLOCATE (catalog[0].found, off_t, MAX (1, catalog[0].Naverage));
    4243  for (i = 0; i < catalog[0].Naverage; i++) {
    4344    catalog[0].found[i] = FALSE;
    … …  
    6667void skip_measurements (Catalog *catalog, int pass) {
    6768
    68   int i, k, m, ecode, d1, d2;
    69   int Ntot, Ntry, Nkeep, Nskip;
     69  off_t i, k, m;
     70  int ecode, d1, d2;
     71  off_t Ntot, Ntry, Nkeep, Nskip;
    7072  float mag;
    7173
    … …  
    136138    }
    137139  }
    138   if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %d, Ntry: %d, Nskip: %d, Nkeep: %d\n",
    139                         pass, Ntot, Ntry, Nskip, Nkeep);
     140  if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %lld, Ntry: %lld, Nskip: %lld, Nkeep: %lld\n",
     141                        pass, (long long) Ntot, (long long) Ntry, (long long) Nskip, (long long) Nkeep);
    140142}
    141143
Note: See TracChangeset for help on using the changeset viewer.