Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/include/delstar.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/include/delstar.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/include/delstar.h (revision 27305) @@ -40,6 +40,6 @@ int FindDecBand PROTO((double dec, double *DEC0, double *DEC1)); FILE *GetDB PROTO((int *state)); -Image *GetImages PROTO((int *nimage)); -int SetImages PROTO((Image *new, int Nnew)); +Image *GetImages PROTO((off_t *nimage)); +int SetImages PROTO((Image *new, off_t Nnew)); void SetProtect PROTO((int mode)); int SetSignals PROTO((void)); @@ -52,17 +52,17 @@ void delete_times PROTO((FITS_DB *db)); int edge_check PROTO((double *x1, double *y1, double *x2, double *y2)); -int *find_images_data PROTO((FITS_DB *db, Image *timage, int *nlist)); -int *find_images_name PROTO((FITS_DB *db, char *filename, int *nlist)); -int *find_images_time PROTO((FITS_DB *db, time_t start, time_t end, PhotCode *code, int *nlist)); -void find_matches PROTO((Catalog *catalog, int photcode, int start, int end)); +off_t *find_images_data PROTO((FITS_DB *db, Image *timage, off_t *nlist)); +off_t *find_images_name PROTO((FITS_DB *db, char *filename, off_t *nlist)); +off_t *find_images_time PROTO((FITS_DB *db, e_time start, e_time end, PhotCode *code, off_t *nlist)); +void find_matches PROTO((Catalog *catalog, int photcode, e_time start, e_time end)); int gcatalog PROTO((Catalog *catalog)); Image *gimages PROTO((char *filename)); -Image *gtimes PROTO((int *NIMAGE)); +Image *gtimes PROTO((off_t *NIMAGE)); void help PROTO((void)); int load_image_db PROTO((FITS_DB *db)); void lock_image_db PROTO((FITS_DB *db, char *filename)); -void match_images PROTO((Catalog *catalog, Image *image, int Nimage)); +void match_images PROTO((Catalog *catalog, Image *image, off_t Nimage)); double opening_angle PROTO((double x1, double y1, double x2, double y2, double x3, double y3)); -int parse_time PROTO((Header *header)); +e_time parse_time PROTO((Header *header)); int save_image_db PROTO((void)); void sort_lists PROTO((float *X, float *Y, int *S, int N)); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagefile.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagefile.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagefile.c (revision 27305) @@ -3,8 +3,8 @@ void delete_imagefile (FITS_DB *db, char *filename) { - int i, Nimlist; - int *imlist; + off_t i, Nimlist; + off_t *imlist; double trange; - time_t start, stop; + e_time start, stop; Image *image; Catalog catalog; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagename.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagename.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagename.c (revision 27305) @@ -3,7 +3,7 @@ void delete_imagename (FITS_DB *db, char *name) { - int i, j, k; - int Nimlist, Nimage, Noutimage; - int *imlist; + off_t i, j, k; + off_t Nimlist, Nimage, Noutimage; + off_t *imlist; double trange; time_t start, stop; @@ -77,9 +77,9 @@ Noutimage = Nimage - Nimlist; - if (VERBOSE) fprintf (stderr, "removing %d images (leaving %d of %d)\n", Nimlist, Noutimage, Nimage); + if (VERBOSE) fprintf (stderr, "removing %lld images (leaving %lld of %lld)\n", (long long) Nimlist, (long long) Noutimage, (long long) Nimage); // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage); - gfits_modify (&db[0].theader, "NAXIS2", "%d", 1, Noutimage); - gfits_modify (&db[0].header, "NIMAGES", "%d", 1, Noutimage); + gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, Noutimage); + gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, Noutimage); db[0].theader.Naxis[1] = Noutimage; db[0].ftable.buffer = (char *) outimage; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_missed.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_missed.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_missed.c (revision 27305) @@ -5,6 +5,5 @@ delete_missed (Catalog *catalog) { - int i; - int Nave, Nmeas, Nmiss; + off_t i, Nave, Nmeas, Nmiss; Nave = catalog[0].Naverage; @@ -12,5 +11,5 @@ Nmiss = catalog[0].Nmissing; - if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss); + if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss); /* set up references for missing to average */ @@ -20,5 +19,5 @@ REALLOCATE (catalog[0].missing, Missing, 1); catalog[0].Nmissing = 0; - if (VERBOSE) fprintf (stderr, " ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss); + if (VERBOSE) fprintf (stderr, " ending with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_orphans.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_orphans.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_orphans.c (revision 27305) @@ -3,8 +3,8 @@ delete_orphans (char *name) { - int i, j, k, n, m, N, M, found; - int *N1, *N2, *next, *next_miss, *ave_miss, last, last_miss; - int Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch; - int start, end, Nmeasfound, Nsecfilt; + off_t i, j, k, n, m, Nmeasfound, Nsecfilt, N, M, found; + off_t *next_meas, *next_miss, *ave_miss, last, last_miss; + off_t Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch; + e_time start, end; unsigned int flags; Measure *tmpmeasure; @@ -26,5 +26,5 @@ Nmeas = catalog.Nmeasure; - ALLOCATE (next, int, Nmeas); + ALLOCATE (next_meas, int, Nmeas); Nmiss = catalog.Nmissing; @@ -36,7 +36,7 @@ /* set up pointers for linked list of measure */ for (i = 0; i < Nmeas - 1; i++) { - next[i] = i+1; - } - next[i] = -1; + next_meas[i] = i+1; + } + next_meas[i] = -1; last = i; /* set up pointers for linked list of missing */ @@ -60,18 +60,18 @@ /* this star is an orphan */ Nmeasfound ++; - next[i] = -2; /* we delete this one */ + next_meas[i] = -2; /* we delete this one */ /* fix the list links: connect the previous valid link to the next valid link */ - for (j = i; (j >= 0) && (next[j] == -2); j--); /* find previous entry to fix link */ + for (j = i; (j >= 0) && (next_meas[j] == -2); j--); /* find previous entry to fix link */ if (j >= 0) { /* if j < 0, there is no previous valid link, ignore this step */ - if (next[j] != i) { + if (next_meas[j] != i) { fprintf (stderr, "error? this link seems to have been lost\n"); exit (1); } /* find next valid entry to fix link */ - for (k = i; (k < Nmeas) && (next[k] == -2); k++); + for (k = i; (k < Nmeas) && (next_meas[k] == -2); k++); if (k < Nmeas) - next[j] = k; + next_meas[j] = k; else - next[j] = -1; /* last link in list gets a -1 */ + next_meas[j] = -1; /* last link in list gets a -1 */ } @@ -111,5 +111,5 @@ m = catalog.average[n].offset; /* find next valid entry -- notice lack of error checking... */ - for (j = 0; (j < Nmeas) && (next[m+j] == -2); j++); + for (j = 0; (j < Nmeas) && (next_meas[m+j] == -2); j++); catalog.average[n].offset = m + j; } @@ -218,5 +218,5 @@ tmpmeasure[N] = catalog.measure[n]; tmpmeasure[N].averef = i; - n = next[n]; + n = next_meas[n]; } } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_times.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_times.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_times.c (revision 27305) @@ -3,8 +3,9 @@ void delete_times (FITS_DB *db) { - int i, j, k, n; - int Nimage, Nimlist, found, code; - int Nregions, NREGIONS; - int *imlist; + int found, code; + off_t i, j, k, n; + off_t Nimage, Nimlist; + off_t Nregions, NREGIONS; + off_t *imlist; SkyList *skylist, *skyset; SkyTable *sky; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_image_db.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_image_db.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_image_db.c (revision 27305) @@ -1,8 +1,8 @@ # include "delstar.h" -int *find_images_name (FITS_DB *db, char *filename, int *nlist) { +off_t *find_images_name (FITS_DB *db, char *filename, off_t *nlist) { - int i, Nimage, Nlist, NLIST; - int *list; + off_t i, Nimage, Nlist, NLIST; + off_t *list; char *p, *name; Image *image; @@ -20,5 +20,5 @@ Nlist = 0; NLIST = 100; - ALLOCATE (list, int, NLIST); + ALLOCATE (list, off_t, NLIST); for (i = 0; i < Nimage; i++) { @@ -26,5 +26,5 @@ list[Nlist] = i; Nlist ++; - CHECK_REALLOCATE (list, int, NLIST, Nlist, 100); + CHECK_REALLOCATE (list, off_t, NLIST, Nlist, 100); } @@ -34,8 +34,8 @@ /* find images in db by image data (time/photcode) */ -int *find_images_data (FITS_DB *db, Image *timage, int *nlist) { +off_t *find_images_data (FITS_DB *db, Image *timage, off_t *nlist) { - int i, Nimage, Nlist, NLIST; - int *list; + off_t i, Nimage, Nlist, NLIST; + off_t *list; Image *image; time_t start, stop; @@ -50,5 +50,5 @@ Nlist = 0; NLIST = 100; - ALLOCATE (list, int, NLIST); + ALLOCATE (list, off_t, NLIST); for (i = 0; i < Nimage; i++) { @@ -58,5 +58,5 @@ list[Nlist] = i; Nlist ++; - CHECK_REALLOCATE (list, int, NLIST, Nlist, 100); + CHECK_REALLOCATE (list, off_t, NLIST, Nlist, 100); } @@ -66,8 +66,8 @@ /* find images in db by image data (time/photcode) */ -int *find_images_time (FITS_DB *db, time_t start, time_t end, PhotCode *code, int *nlist) { +off_t *find_images_time (FITS_DB *db, e_time start, e_time end, PhotCode *code, off_t *nlist) { - int i, Nimage, Nlist, NLIST; - int *list; + off_t i, Nimage, Nlist, NLIST; + off_t *list; Image *image; @@ -76,5 +76,5 @@ Nlist = 0; NLIST = 100; - ALLOCATE (list, int, NLIST); + ALLOCATE (list, off_t, NLIST); for (i = 0; i < Nimage; i++) { @@ -86,5 +86,5 @@ list[Nlist] = i; Nlist ++; - CHECK_REALLOCATE (list, int, NLIST, Nlist, 100); + CHECK_REALLOCATE (list, off_t, NLIST, Nlist, 100); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_matches.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_matches.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/find_matches.c (revision 27305) @@ -1,11 +1,12 @@ # include "delstar.h" -void find_matches (Catalog *catalog, int photcode, int start, int end) { - - int i, j, k, n, m, N, M, drop, averef; - int *next, *next_miss, *ave_miss, last, last_miss; - int Nave, Nmeas, NMEAS, Nmiss; - int Nmeasfound, Nsecfilt; - int this, prev; +void find_matches (Catalog *catalog, int photcode, e_time start, e_time end) { + + int drop; + off_t i, j, k, n, m, N, M, averef; + off_t *next_meas, *next_miss, *ave_miss, last, last_miss; + off_t Nave, Nmeas, NMEAS, Nmiss; + off_t Nmeasfound, Nsecfilt; + off_t this, prev; Measure *tmpmeasure; Missing *tmpmissing; @@ -15,17 +16,17 @@ Nmeas = catalog[0].Nmeasure; - ALLOCATE (next, int, MAX(Nmeas,1)); + ALLOCATE (next_meas, off_t, MAX(Nmeas,1)); Nmiss = catalog[0].Nmissing; - ALLOCATE (next_miss, int, MAX(Nmiss,1)); - ALLOCATE (ave_miss, int, MAX(Nmiss,1)); + ALLOCATE (next_miss, off_t, MAX(Nmiss,1)); + ALLOCATE (ave_miss, off_t, MAX(Nmiss,1)); - if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss); + if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss); /* set up pointers for linked list of measure */ for (i = 0; i < Nmeas - 1; i++) { - next[i] = i+1; - } - next[i] = -1; + next_meas[i] = i+1; + } + next_meas[i] = -1; last = i; /* set up pointers for linked list of missing */ @@ -63,24 +64,24 @@ /* this star is in this image */ - this = next[i]; - next[i] = -2; /* we delete this one */ - if (prev != -1) { next[prev] = this; } + this = next_meas[i]; + next_meas[i] = -2; /* we delete this one */ + if (prev != -1) { next_meas[prev] = this; } # if (0) /* why is this section disabled? */ /* fix the list links: connect the previous valid link to the next valid link */ - for (j = i; (j >= 0) && (next[j] == -2); j--); /* find previous entry to fix link */ + for (j = i; (j >= 0) && (next_meas[j] == -2); j--); /* find previous entry to fix link */ if (j >= 0) { /* if j < 0, there is no previous valid link, ignore this step */ - if (next[j] != i) { + if (next_meas[j] != i) { fprintf (stderr, "error? (1) this link seems to have been lost\n"); - fprintf (stderr, "j: %d, next[j]: %d, i: %d\n", j, next[j], i); + fprintf (stderr, "j: %lld, next_meas[j]: %lld, i: %lld\n", (long long) j, (long long) next_meas[j], (long long) i); exit (1); } /* find next valid entry to fix link */ - for (k = i; (k < Nmeas) && (next[k] == -2); k++); + for (k = i; (k < Nmeas) && (next_meas[k] == -2); k++); if (k < Nmeas) - next[j] = k; + next_meas[j] = k; else - next[j] = -1; /* last link in list gets a -1 */ + next_meas[j] = -1; /* last link in list gets a -1 */ } # endif @@ -107,5 +108,5 @@ if (next_miss[j] != m) { fprintf (stderr, "error? (2) this link seems to have been lost\n"); - fprintf (stderr, "j: %d, next_miss[j]: %d, i: %d\n", j, next_miss[j], i); + fprintf (stderr, "j: %lld, next_miss[j]: %lld, i: %lld\n", (long long) j, (long long) next_miss[j], (long long) i); exit (1); } @@ -122,5 +123,5 @@ m = catalog[0].average[n].measureOffset; /* find next valid entry -- notice lack of error checking... */ - for (j = 0; (j < Nmeas) && (next[m+j] == -2); j++); + for (j = 0; (j < Nmeas) && (next_meas[m+j] == -2); j++); if (catalog[0].measure[m+j].averef != n) { fprintf (stderr, "error? measure.averef and average.measureOffset are mismatched\n"); @@ -130,5 +131,5 @@ } } - fprintf (stderr, "found %d meas to remove\n", Nmeasfound); + fprintf (stderr, "found %lld meas to remove\n", (long long) Nmeasfound); if (VERBOSE) fprintf (stderr, "fixing missing..."); @@ -145,5 +146,5 @@ if (next_miss[j] != i) { fprintf (stderr, "error? (3) this link seems to have been lost\n"); - fprintf (stderr, "j: %d, next_miss[j]: %d, i: %d\n", j, next_miss[j], i); + fprintf (stderr, "j: %lld, next_miss[j]: %lld, i: %lld\n", (long long) j, (long long) next_miss[j], (long long) i); exit (1); } @@ -209,5 +210,5 @@ tmpmeasure[N] = catalog[0].measure[n]; tmpmeasure[N].averef = i; - n = next[n]; + n = next_meas[n]; CHECK_REALLOCATE (tmpmeasure, Measure, NMEAS, N, 10000); } @@ -248,7 +249,7 @@ catalog[0].Nsecf_mem = Nave*Nsecfilt; - if (VERBOSE) fprintf (stderr, " ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss); - - free (next); + if (VERBOSE) fprintf (stderr, " ending with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss); + + free (next_meas); free (next_miss); free (ave_miss); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/match_images.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/match_images.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/match_images.c (revision 27305) @@ -1,8 +1,8 @@ # include "delstar.h" -void match_images (Catalog *catalog, Image *image, int Nimage) { +void match_images (Catalog *catalog, Image *image, off_t Nimage) { - int j, k, found; - unsigned int *start, *stop; + off_t j, k, found; + e_time *start, *stop; /* this must be allocated so future free will not fail */ Index: /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/parse_time.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/parse_time.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/parse_time.c (revision 27305) @@ -1,5 +1,5 @@ # include "delstar.h" -int parse_time (Header *header) { +e_time parse_time (Header *header) { double jd; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/elixir/src/ProcessOps.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/elixir/src/ProcessOps.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/elixir/src/ProcessOps.c (revision 27305) @@ -203,5 +203,5 @@ switch (Nterms) { case 0: - sprintf (line, format); + sprintf (line, "%s", format); break; case 1: Index: /branches/eam_branches/largefiles.20100314/Ohana/src/gastro2/src/rfits.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/gastro2/src/rfits.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/gastro2/src/rfits.c (revision 27305) @@ -3,5 +3,6 @@ StarData *rfits (FILE *f, int *nstars) { - int i, N, Nstars; + int N; + off_t i, Nstars; Header theader; FTable table; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/altpath.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/altpath.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/altpath.c (revision 27305) @@ -2,13 +2,14 @@ # include "detrend.h" -int SetAltpath (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch) { +int SetAltpath (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch) { - int i, j, n, found, status, Nlist; - int *list, *current; + int status, found; + off_t i, j, n, Nlist; + off_t *list, *current; char *dBPath, infile[256], outfile[256], line[1024]; struct stat statbuf; - ALLOCATE (current, int, Nimage); - ALLOCATE (list, int, Nimage); + ALLOCATE (current, off_t, Nimage); + ALLOCATE (list, off_t, Nimage); Nlist = 0; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/criteria.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/criteria.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/criteria.c (revision 27305) @@ -60,7 +60,7 @@ */ -Match *ExptimeCriteria (DetReg *image, int Nimage, Match *match, int *nmatch) { - - int i, j, Nmatch, Nnew, NNEW, entry; +Match *ExptimeCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch) { + + off_t i, j, Nmatch, Nnew, NNEW, entry; unsigned long dtime; float Chi, ChiMin; @@ -132,7 +132,7 @@ } -Match *CloseCriteria (DetReg *image, int Nimage, Match *match, int *nmatch) { - - int i, j, Nmatch, Nnew, NNEW, Ngood, entry; +Match *CloseCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch) { + + off_t i, j, Nmatch, Nnew, NNEW, Ngood, entry; unsigned long dmin, dtime; Match *new; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/delete.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/delete.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/delete.c (revision 27305) @@ -2,13 +2,13 @@ # include "detrend.h" -void DeleteSubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch) { +void DeleteSubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch) { - int i, j; - int *keep, Ndel, Nsubset; + off_t i, j; + off_t *keep, Ndel, Nsubset; DetReg *subset; - ALLOCATE (keep, int, MAX (Nimage, 1)); + ALLOCATE (keep, off_t, MAX (Nimage, 1)); for (i = 0; i < Nimage; i++) keep[i] = TRUE; - fprintf (stderr, "total of %d detrend images\n", Nimage); + fprintf (stderr, "total of %lld detrend images\n", (long long) Nimage); Ndel = 0; @@ -20,5 +20,5 @@ delete_image (&image[i]); } - fprintf (stderr, "delete %d images\n", Ndel); + fprintf (stderr, "delete %lld images\n", (long long) Ndel); if (Ndel == 0) { fprintf (stderr, "SUCCESS\n"); @@ -30,5 +30,5 @@ Nsubset = Nimage - Ndel; ALLOCATE (subset, DetReg, MAX (1, Nsubset)); - fprintf (stderr, "keeping %d images\n", Nsubset); + fprintf (stderr, "keeping %lld images\n", (long long) Nsubset); for (j = i = 0; i < Nimage; i++) { if (!keep[i]) continue; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/match.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/match.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/match.c (revision 27305) @@ -2,8 +2,8 @@ # include "detrend.h" -Match *MatchCriteria (DetReg *image, int Nimage, int *nmatch) { +Match *MatchCriteria (DetReg *image, off_t Nimage, off_t *nmatch) { - int i; - int Nmatch, NMATCH; + off_t i; + off_t Nmatch, NMATCH; Match result, *match; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/modify.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/modify.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/modify.c (revision 27305) @@ -2,12 +2,12 @@ # include "detrend.h" -int ModifySubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch) { +int ModifySubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch) { - int i, j, value; - int *list; + off_t i, j, value; + off_t *list; value = M_UNDEF; - ALLOCATE (list, int, Nimage); + ALLOCATE (list, off_t, Nimage); if (!strcasecmp (output.ModifyEntry, "mode")) { value = get_image_mode (output.ModifyValue); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/output.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/output.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/output.c (revision 27305) @@ -5,5 +5,5 @@ extern double drand48(); -int OutputSubset (DetReg *image, int Nimage, Match *match, int Nmatch) { +int OutputSubset (DetReg *image, off_t Nimage, Match *match, off_t Nmatch) { if (output.table != (char *) NULL) { @@ -19,7 +19,7 @@ /* write out complete binary FITS table in format of db */ -int DumpFitsBintable (char *filename, DetReg *image, Match *match, int Nmatch) { - - int i, j; +int DumpFitsBintable (char *filename, DetReg *image, Match *match, off_t Nmatch) { + + off_t i, j; FILE *f; Header header; @@ -60,5 +60,5 @@ } -int DumpFitsTable (char *filename, DetReg *detdata, Match *match, int Nmatch) { +int DumpFitsTable (char *filename, DetReg *detdata, Match *match, off_t Nmatch) { Header header, theader; @@ -69,5 +69,5 @@ char *startstr, *stopstr, *regstr, *line, key[33], ccdinfo[16]; char *filtstr, *typestr, *modestr, *ccdstr, *datestr, *p; - int i; + off_t i; time_t tsecond; @@ -191,9 +191,10 @@ /* Select, TimeMode are global */ -int PrintSubset (DetReg *detdata, Match *match, int Nmatch) { +int PrintSubset (DetReg *detdata, Match *match, off_t Nmatch) { char *dBPath, *Path, *typestr, *filtstr, filename[128]; char *timestr, *modestr, *ccdstr, ccdinfo[16], ccdformat[16]; - int i, j, Nc; + off_t i, j; + int Nc; struct timeval now; long A; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/select.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/select.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/select.c (revision 27305) @@ -2,5 +2,5 @@ # include "detrend.h" -Match SelectEntry (DetReg *image, int Nimage, Match *list, int Nlist, Criteria *crit) { +Match SelectEntry (DetReg *image, off_t Nimage, Match *list, off_t Nlist, Criteria *crit) { /* force a single selection */ @@ -15,6 +15,6 @@ */ - int i, j, entry, order, matchnum; - int nmatch, Nmatch; + off_t i, j, entry, order, matchnum; + off_t nmatch, Nmatch; unsigned int tstart; Match *match, *tmatch, answer; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/unique.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/unique.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/unique.c (revision 27305) @@ -3,8 +3,9 @@ /* define a list of best images which have unique properties */ -Match *UniqueSubset (DetReg *image, int Nimage, Match *match, int *nmatch) { +Match *UniqueSubset (DetReg *image, off_t Nimage, Match *match, off_t *nmatch) { - int Nsubset, Nunique, Ncrit, NCRIT; - int i, j, N, Nmatch, found; + int found; + off_t Nsubset, Nunique, Ncrit, NCRIT; + off_t i, j, N, Nmatch; Criteria *crit; Match *subset, *unique, *local; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/dumpfits.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/dumpfits.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/dumpfits.c (revision 27305) @@ -3,7 +3,7 @@ /* write out complete binary FITS table in format of db */ -int DumpFitsBintable (char *filename, Image *image, int *match, int Nmatch) { +int DumpFitsBintable (char *filename, Image *image, off_t *match, off_t Nmatch) { - int i, j; + off_t i, j; FILE *f; Header header; @@ -44,5 +44,5 @@ } -int DumpFitsTable (char *filename, Image *image, int *match, int Nmatch) { +int DumpFitsTable (char *filename, Image *image, off_t *match, off_t Nmatch) { Header header; @@ -53,5 +53,5 @@ FILE *f; char *startstr, *filtstr, *datestr, *line; - int i; + off_t i; double zp, dzp, ra, dec, airmass, sky; time_t tsecond; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/modify.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/modify.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/modify.c (revision 27305) @@ -2,7 +2,7 @@ # include "imphot.h" -void ModifySubset (FITS_DB *db, Image *image, int Nimage, int *match, int Nmatch) { +void ModifySubset (FITS_DB *db, Image *image, off_t Nimage, off_t *match, off_t Nmatch) { - int i, j; + off_t i, j; /* modify the selected entries */ Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/output.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/output.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/output.c (revision 27305) @@ -2,5 +2,5 @@ # include "imphot.h" -int output (Image *image, int *match, int Nmatch) { +int output (Image *image, off_t *match, off_t Nmatch) { int status; @@ -22,7 +22,7 @@ } -int PrintSubset (Image *image, int *match, int Nmatch) { +int PrintSubset (Image *image, off_t *match, off_t Nmatch) { - int i, j; + off_t i, j; char *timestr, *photstr; static char PhotError[] = "unknown"; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/subset.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/subset.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/subset.c (revision 27305) @@ -2,9 +2,9 @@ # include "imphot.h" -int *subset (Image *image, int Nimage, int *nsubset) { +off_t *subset (Image *image, off_t Nimage, off_t *nsubset) { - int i, j, status; - int Nsubset, NameSelectLength; - int *index; + off_t i, j, status; + off_t Nsubset, NameSelectLength; + off_t *index; NameSelectLength = 0; @@ -12,5 +12,5 @@ /* allocate space for reference lists */ Nsubset = 0; - ALLOCATE (index, int, Nimage); + ALLOCATE (index, off_t, Nimage); if (criteria.NameSelect) { Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/cadc.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/cadc.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/cadc.c (revision 27305) @@ -4,7 +4,7 @@ static int REFCCD; -void DumpCADCTable (char *filename, RegImage *image, int *match, int Nmatch) { - - int i, Obsid, Nobsid, Nsubset, ref; +void DumpCADCTable (char *filename, RegImage *image, off_t *match, off_t Nmatch) { + + off_t i, Obsid, Nobsid, Nsubset, ref; char *datestr, *line, hdrname[99]; time_t tsecond; @@ -13,7 +13,7 @@ FTable table; RegImage *row; - int *index, *entry, *obsid; + off_t *index, *entry, *obsid; MosaicLayout *layout; - int *subset; + off_t *subset; double left, right, center, outer, top, bottom; double iqx, iqy, iqr, iqf, iqo; @@ -127,13 +127,13 @@ } -int *GetObsIDSubset (RegImage *image, int start, int *index, int *entry, int Nindex, int *Nsubset) { - - int i, N, NSUBSET; - int *subset; +off_t *GetObsIDSubset (RegImage *image, off_t start, off_t *index, off_t *entry, off_t Nindex, off_t *Nsubset) { + + off_t i, N, NSUBSET; + off_t *subset; /* create output index */ N = 0; NSUBSET = 64; - ALLOCATE (subset, int, NSUBSET); + ALLOCATE (subset, off_t, NSUBSET); /* find unique sequences */ @@ -143,5 +143,5 @@ if (N == NSUBSET) { NSUBSET += 64; - REALLOCATE (subset, int, NSUBSET); + REALLOCATE (subset, off_t, NSUBSET); } } @@ -152,13 +152,13 @@ /* return an index list of unique obs id entries at start of sequence */ -int *GetUniqueObsID (RegImage *image, int *index, int *entry, int Nindex, int *Nmatch) { - - int i, j, N, NMATCH; - int *match; +off_t *GetUniqueObsID (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t *Nmatch) { + + off_t i, j, N, NMATCH; + off_t *match; /* create output index */ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); /* find unique sequences */ @@ -171,5 +171,5 @@ if (N == NMATCH) { NMATCH += 1000; - REALLOCATE (match, int, NMATCH); + REALLOCATE (match, off_t, NMATCH); } @@ -182,13 +182,13 @@ /* return seeing for ccd == REFCCD */ -int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start) { - - int i, N, NMATCH; - int *match; +off_t GetREFCCD (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t start) { + + off_t i, N, NMATCH; + off_t *match; /* create output index */ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); /* find unique sequences */ @@ -199,12 +199,12 @@ } -void GetObsIDIndex (RegImage *image, int *match, int Nmatch, int **Index, int **Entry) { - - int i; - int *index, *entry; +void GetObsIDIndex (RegImage *image, off_t *match, off_t Nmatch, off_t **Index, off_t **Entry) { + + off_t i; + off_t *index, *entry; /* index = OBSID */ - ALLOCATE (index, int, Nmatch); - ALLOCATE (entry, int, Nmatch); + ALLOCATE (index, off_t, Nmatch); + ALLOCATE (entry, off_t, Nmatch); for (i = 0; i < Nmatch; i++) { index[i] = atoi (image[match[i]].filename); @@ -212,5 +212,5 @@ entry[i] = match[i]; } - isortpair (index, entry, Nmatch); + llsortpair (index, entry, Nmatch); *Index = index; *Entry = entry; @@ -218,7 +218,8 @@ /* match is a list of image entries with the same obsid */ -double MosaicIQStats (RegImage *image, int *match, int Nmatch, MosaicRegion *region) { - - int i, j, N, Nccd; +double MosaicIQStats (RegImage *image, off_t *match, off_t Nmatch, MosaicRegion *region) { + + int i, N, Nccd; + off_t j; double *list, value; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/delete.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/delete.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/delete.c (revision 27305) @@ -2,13 +2,13 @@ # include "imreg.h" -void DeleteSubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch) { +void DeleteSubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) { - int i, j; - int *keep, Ndel, Nsubset; + off_t i, j; + off_t *keep, Ndel, Nsubset; RegImage *subset; - ALLOCATE (keep, int, MAX (Nimage, 1)); + ALLOCATE (keep, off_t, MAX (Nimage, 1)); for (i = 0; i < Nimage; i++) keep[i] = TRUE; - fprintf (stderr, "total of %d images\n", Nimage); + fprintf (stderr, "total of %lld images\n", (long long) Nimage); Ndel = 0; @@ -19,5 +19,5 @@ Ndel ++; } - fprintf (stderr, "delete %d images\n", Ndel); + fprintf (stderr, "delete %lld images\n", (long long) Ndel); if (Ndel == 0) { fprintf (stderr, "SUCCESS\n"); @@ -29,5 +29,5 @@ Nsubset = Nimage - Ndel; ALLOCATE (subset, RegImage, MAX (1, Nsubset)); - fprintf (stderr, "keeping %d images\n", Nsubset); + fprintf (stderr, "keeping %lld images\n", (long long) Nsubset); for (j = i = 0; i < Nimage; i++) { if (!keep[i]) continue; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/match.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/match.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/match.c (revision 27305) @@ -2,15 +2,15 @@ # include "imreg.h" -int *match_criteria (RegImage *image, int Nimage, int *Nmatch) { +off_t *match_criteria (RegImage *image, off_t Nimage, off_t *Nmatch) { - int i, j, Nname; - int N, NMATCH; - int *match; - int reject; + off_t i, j, Nname; + off_t N, NMATCH; + off_t *match; + off_t reject; /* create selection index */ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); Nname = 0; @@ -36,5 +36,5 @@ if (N == NMATCH) { NMATCH += 1000; - REALLOCATE (match, int, NMATCH); + REALLOCATE (match, off_t, NMATCH); } } @@ -43,11 +43,11 @@ } -int *match_images (RegImage *image, int Nimage, RegImage *subset, int Nsubset, int *Nmatch) { +off_t *match_images (RegImage *image, off_t Nimage, RegImage *subset, off_t Nsubset, off_t *Nmatch) { - int i, j, N, Nfound; - int *match; + off_t i, j, N, Nfound; + off_t *match; /* find matching images - very inefficient : sort by obstime, find those first? */ - ALLOCATE (match, int, Nsubset); + ALLOCATE (match, off_t, Nsubset); for (j = 0; j < Nsubset; j++) { match[j] = -1; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/modify.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/modify.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/modify.c (revision 27305) @@ -2,7 +2,7 @@ # include "imreg.h" -void ModifySubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch) { +void ModifySubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) { - int i, j, Nold; + off_t i, j, Nold; char *tmppath; char *ext, *root, *path, dist; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/newimages.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/newimages.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/newimages.c (revision 27305) @@ -2,7 +2,7 @@ # include "imreg.h" -RegImage *newimages (RegImage *image, int *Nimage) { +RegImage *newimages (RegImage *image, off_t *Nimage) { - int i, Nnew; + off_t i, Nnew; RegImage *regimage; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/output.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/output.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/output.c (revision 27305) @@ -24,5 +24,5 @@ /* given a subset list, write out the selected images, if desired */ -void OutputSubset (RegImage *image, int Nimage, int *match, int Nmatch) { +void OutputSubset (RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) { if (output.table != (char *) NULL) { @@ -45,7 +45,7 @@ /* write out complete binary FITS table in format of db */ -void DumpFitsBintable (char *filename, RegImage *image, int *match, int Nmatch) { - - int i, j; +void DumpFitsBintable (char *filename, RegImage *image, off_t *match, off_t Nmatch) { + + off_t i, j; FILE *f; Header header; @@ -87,7 +87,7 @@ } -void DumpFitsTable (char *filename, RegImage *image, int *match, int Nmatch) { - - int i; +void DumpFitsTable (char *filename, RegImage *image, off_t *match, off_t Nmatch) { + + off_t i; char *obsstr, *regstr, *line, dummy[64]; char *modestr, *typestr, *ccdstr, *datestr; @@ -184,8 +184,8 @@ /* Select, TimeMode are global */ -int PrintSubset (RegImage *image, int *match, int Nmatch) { +int PrintSubset (RegImage *image, off_t *match, off_t Nmatch) { char ccdstr[64]; - int i, j; + off_t i, j; char *modestr, *typestr, *timestr, *root, *path; @@ -227,5 +227,5 @@ } else { /* this is somewhat poor: I have predefined a subset of value, and I can't guarantee that 'filter' has no spaces */ - fprintf (stdout, "%5d %6s %6s %s ", i, typestr, modestr, ccdstr); + fprintf (stdout, "%5lld %6s %6s %s ", (long long) i, typestr, modestr, ccdstr); fprintf (stdout, "%s %s ", image[i].pathname, image[i].filename); fprintf (stdout, "%s %f %s %f %f %f\n", image[i].filter, image[i].exptime, @@ -238,7 +238,7 @@ } -int dump_data (RegImage *image, int Nimage) { - - int i; +int dump_data (RegImage *image, off_t Nimage) { + + off_t i; for (i = 0; i < Nimage; i++) { Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/unique.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/unique.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/unique.c (revision 27305) @@ -2,9 +2,9 @@ # include "imreg.h" -void sortstr (char **S, int *X, int N) { +void sortstr (char **S, off_t *X, off_t N) { # define SWAPFUNC(A,B){ \ - char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \ - int itmp = X[A]; X[A] = X[B]; X[B] = itmp; \ + char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \ + off_t itmp = X[A]; X[A] = X[B]; X[B] = itmp; \ } # define COMPARE(A,B)(strcmp(S[A], S[B]) < 0) @@ -18,9 +18,9 @@ /* input is a subset index of image list, output is a new subset */ -int *unique_entries (RegImage *image, int Nimage, int *subset, int *Nmatch) { +off_t *unique_entries (RegImage *image, off_t Nimage, off_t *subset, off_t *Nmatch) { - int i, j, k, m, Nsubset; - int N, NMATCH; - int *match, *entry; + off_t i, j, k, m, Nsubset; + off_t N, NMATCH; + off_t *match, *entry; char idxline[128]; char **index; @@ -31,5 +31,5 @@ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); Nsubset = *Nmatch; @@ -37,5 +37,5 @@ /* index = filename.ccd */ ALLOCATE (index, char *, Nsubset); - ALLOCATE (entry, int, Nsubset); + ALLOCATE (entry, off_t, Nsubset); for (i = 0; i < Nsubset; i++) { sprintf (idxline, "%s.%02d", image[subset[i]].filename, image[subset[i]].ccd); @@ -63,5 +63,5 @@ if (N == NMATCH) { NMATCH += 1000; - REALLOCATE (match, int, NMATCH); + REALLOCATE (match, off_t, NMATCH); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/detrend.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/detrend.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/detrend.h (revision 27305) @@ -82,15 +82,15 @@ char **LoadRecipe (char *filter, int *nrecipe); -Match *MatchCriteria (DetReg *image, int Nimage, int *nmatch); -Match *UniqueSubset (DetReg *image, int Nimage, Match *match, int *nmatch); -Match *ExptimeCriteria (DetReg *image, int Nimage, Match *match, int *nmatch); -Match *CloseCriteria (DetReg *image, int Nimage, Match *match, int *nmatch); +Match *MatchCriteria (DetReg *image, off_t Nimage, off_t *nmatch); +Match *UniqueSubset (DetReg *image, off_t Nimage, Match *match, off_t *nmatch); +Match *ExptimeCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch); +Match *CloseCriteria (DetReg *image, off_t Nimage, Match *match, off_t *nmatch); Match CheckCriteria (DetReg *image); -int OutputSubset (DetReg *image, int Nimage, Match *match, int Nmatch); -int DumpFitsTable (char *filename, DetReg *detdata, Match *match, int Nmatch); -int PrintSubset (DetReg *detdata, Match *match, int Nmatch); -Match SelectEntry (DetReg *image, int Nimage, Match *list, int Nlist, Criteria *crit); +int OutputSubset (DetReg *image, off_t Nimage, Match *match, off_t Nmatch); +int DumpFitsTable (char *filename, DetReg *detdata, Match *match, off_t Nmatch); +int PrintSubset (DetReg *detdata, Match *match, off_t Nmatch); +Match SelectEntry (DetReg *image, off_t Nimage, Match *list, off_t Nlist, Criteria *crit); int usage (void); @@ -101,5 +101,5 @@ int escape (int mode, char *message); -int DumpFitsBintable (char *filename, DetReg *image, Match *match, int Nmatch); +int DumpFitsBintable (char *filename, DetReg *image, Match *match, off_t Nmatch); int cmp_crit (Criteria *crit, DetReg *image); int set_crit (Criteria *crit, DetReg *image); @@ -107,5 +107,5 @@ int PrintCriteria (void); -int SetAltpath (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch); -int ModifySubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch); -void DeleteSubset (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch); +int SetAltpath (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch); +int ModifySubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch); +void DeleteSubset (FITS_DB *db, DetReg *image, off_t Nimage, Match *match, off_t Nmatch); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imphot.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imphot.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imphot.h (revision 27305) @@ -20,10 +20,10 @@ int db_load (FITS_DB *db); int args (int argc, char **argv); -int DumpFitsBintable (char *filename, Image *image, int *match, int Nmatch); -int DumpFitsTable (char *filename, Image *image, int *match, int Nmatch); -void ModifySubset (FITS_DB *db, Image *image, int Nimage, int *match, int Nmatch); -int PrintSubset (Image *image, int *match, int Nmatch); -int output (Image *image, int *match, int Nmatch); +int DumpFitsBintable (char *filename, Image *image, off_t *match, off_t Nmatch); +int DumpFitsTable (char *filename, Image *image, off_t *match, off_t Nmatch); +void ModifySubset (FITS_DB *db, Image *image, off_t Nimage, off_t *match, off_t Nmatch); +int PrintSubset (Image *image, off_t *match, off_t Nmatch); +int output (Image *image, off_t *match, off_t Nmatch); int rfits (FITS_DB *db); int rtext (FITS_DB *db); -int *subset (Image *image, int Nimage, int *nsubset); +off_t *subset (Image *image, off_t Nimage, off_t *nsubset); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imreg.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imreg.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imreg.h (revision 27305) @@ -74,19 +74,19 @@ int args (int argc, char **argv); -void DeleteSubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch); +void DeleteSubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch); RegImage *iminfo (char *filename); -int *match_criteria (RegImage *image, int Nimage, int *Nmatch); -int *match_images (RegImage *image, int Nimage, RegImage *subset, int Nsubset, int *Nmatch); +off_t *match_criteria (RegImage *image, off_t Nimage, off_t *Nmatch); +off_t *match_images (RegImage *image, off_t Nimage, RegImage *subset, off_t Nsubset, off_t *Nmatch); -RegImage *newimages (RegImage *image, int *Nimage); +RegImage *newimages (RegImage *image, off_t *Nimage); -void ModifySubset (FITS_DB *db, RegImage *image, int Nimage, int *match, int Nmatch); +void ModifySubset (FITS_DB *db, RegImage *image, off_t Nimage, off_t *match, off_t Nmatch); void SetOutputMode (char *mode); -void OutputSubset (RegImage *image, int Nimage, int *match, int Nmatch); -void DumpFitsBintable (char *filename, RegImage *image, int *match, int Nmatch); -void DumpFitsTable (char *filename, RegImage *image, int *match, int Nmatch); -int PrintSubset (RegImage *image, int *match, int Nmatch); -int dump_data (RegImage *image, int Nimage); +void OutputSubset (RegImage *image, off_t Nimage, off_t *match, off_t Nmatch); +void DumpFitsBintable (char *filename, RegImage *image, off_t *match, off_t Nmatch); +void DumpFitsTable (char *filename, RegImage *image, off_t *match, off_t Nmatch); +int PrintSubset (RegImage *image, off_t *match, off_t Nmatch); +int dump_data (RegImage *image, off_t Nimage); int SubmitImages (RegImage *image); int load_probes (char *filename, unsigned long tzero, int *wantprobe, double *values, int Nprobe); @@ -94,13 +94,13 @@ void set_timezone (double dt); -void DumpCADCTable (char *filename, RegImage *image, int *match, int Nmatch); -int *GetObsIDSubset (RegImage *image, int start, int *index, int *entry, int Nindex, int *Nsubset); -int *GetUniqueObsID (RegImage *image, int *index, int *entry, int Nindex, int *Nmatch); -void GetObsIDIndex (RegImage *image, int *match, int Nmatch, int **Index, int **Entry); +void DumpCADCTable (char *filename, RegImage *image, off_t *match, off_t Nmatch); +off_t *GetObsIDSubset (RegImage *image, off_t start, off_t *index, off_t *entry, off_t Nindex, off_t *Nsubset); +off_t *GetUniqueObsID (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t *Nmatch); +void GetObsIDIndex (RegImage *image, off_t *match, off_t Nmatch, off_t **Index, off_t **Entry); double SigmaClipList (double *list, int N); -double MosaicIQStats (RegImage *image, int *match, int Nmatch, MosaicRegion *region); +double MosaicIQStats (RegImage *image, off_t *match, off_t Nmatch, MosaicRegion *region); MosaicLayout *CreateCFH12K (void); MosaicLayout *CreateMegaCam (void); -int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start); +off_t GetREFCCD (RegImage *image, off_t *index, off_t *entry, off_t Nindex, off_t start); int imregclient (char *fitsfile, char *statfile, char *datfile); @@ -128,3 +128,3 @@ int memstr (char *m1, char *m2, int n); -int *unique_entries (RegImage *image, int Nimage, int *subset, int *Nmatch); +off_t *unique_entries (RegImage *image, off_t Nimage, off_t *subset, off_t *Nmatch); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imregister.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imregister.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imregister.h (revision 27305) @@ -73,8 +73,5 @@ int parse_time (Header *header); -void sort (float *value, int N); -void dsort (double *value, int N); -void sortstr (char **S, int *X, int N); -void sortpair (int *X, int *Y, int N); +void sortstr (char **S, off_t *X, off_t N); void ConfigCamera (void); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/photreg.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/photreg.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/photreg.h (revision 27305) @@ -29,12 +29,12 @@ int regargs (int argc, char **argv, PhotPars *); -void DeleteSubset (FITS_DB *db, PhotPars *photpars, int Nphotpars, int *match, int Nmatch); -int *match_criteria (PhotPars *photpars, int Nphotpars, int *Nmatch); +void DeleteSubset (FITS_DB *db, PhotPars *photpars, off_t Nphotpars, off_t *match, off_t Nmatch); +off_t *match_criteria (PhotPars *photpars, off_t Nphotpars, off_t *Nmatch); -void OutputSubset (PhotPars *photpars, int Nphotpars, int *match, int Nmatch); +void OutputSubset (PhotPars *photpars, off_t Nphotpars, off_t *match, off_t Nmatch); -void DumpFitsBintable (char *filename, PhotPars *image, int *match, int Nmatch); -void DumpFitsTable (char *filename, PhotPars *image, int *match, int Nmatch); -int PrintSubset (PhotPars *image, int *match, int Nmatch); +void DumpFitsBintable (char *filename, PhotPars *image, off_t *match, off_t Nmatch); +void DumpFitsTable (char *filename, PhotPars *image, off_t *match, off_t Nmatch); +int PrintSubset (PhotPars *image, off_t *match, off_t Nmatch); void set_timezone (double dt); @@ -42,4 +42,4 @@ int escape (int mode, char *message); -PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, int Nphotpars); +PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, off_t Nphotpars); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/spreg.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/spreg.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/spreg.h (revision 27305) @@ -78,21 +78,20 @@ char TelescopeKeyword[64]; +int args (int argc, char **argv); +off_t *match_criteria (Spectrum *spectrum, off_t Nspectrum, off_t *Nmatch); +off_t *unique_entries (Spectrum *spectrum, off_t Nspectrum, off_t *subset, off_t *Nmatch); -int args (int argc, char **argv); -int *match_criteria (Spectrum *spectrum, int Nspectrum, int *Nmatch); -int *unique_entries (Spectrum *spectrum, int Nspectrum, int *subset, int *Nmatch); - -void ModifySubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch); -void DeleteSubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch); -void OutputSubset (Spectrum *spectrum, int Nspectrum, int *match, int Nmatch); +void ModifySubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch); +void DeleteSubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch); +void OutputSubset (Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch); void SetOutputMode (char *mode); -void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch); -void DumpFitsTable (char *filename, Spectrum *spectrum, int *match, int Nmatch); -int PrintSubset (Spectrum *spectrum, int *match, int Nmatch); -int dump_data (Spectrum *spectrum, int Nspectrum); +void DumpFitsBintable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch); +void DumpFitsTable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch); +int PrintSubset (Spectrum *spectrum, off_t *match, off_t Nmatch); +int dump_data (Spectrum *spectrum, off_t Nspectrum); Spectrum *spinfo (char *filename); -int *match_spectrums (Spectrum *subset, int Nsubset, int *Nmatch); +off_t *match_spectrums (Spectrum *subset, off_t Nsubset, off_t *Nmatch); int SubmitSpectrums (Spectrum *spectrum); void set_timezone (double dt); @@ -100,6 +99,6 @@ void showinfo (Spectrum *spec); int escape (int mode, char *message); -int set_spectra (Spectrum *new, int Nnew); -Spectrum *get_spectra (int *N); +int set_spectra (Spectrum *new, off_t Nnew); +Spectrum *get_spectra (off_t *N); void ConfigInitSpec (int *argc, char **argv); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/convert.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/convert.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/convert.c (revision 27305) @@ -2,7 +2,7 @@ # include "photreg.h" -PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, int Nphotpars) { +PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, off_t Nphotpars) { - int i; + off_t i; PhotPars *output; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/delete.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/delete.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/delete.c (revision 27305) @@ -2,13 +2,13 @@ # include "photreg.h" -void DeleteSubset (FITS_DB *db, PhotPars *photdata, int Nphotdata, int *match, int Nmatch) { +void DeleteSubset (FITS_DB *db, PhotPars *photdata, off_t Nphotdata, off_t *match, off_t Nmatch) { - int i, j; - int *keep, Ndel, Nsubset; + off_t i, j; + off_t *keep, Ndel, Nsubset; PhotPars *subset; - ALLOCATE (keep, int, MAX (Nphotdata, 1)); + ALLOCATE (keep, off_t, MAX (Nphotdata, 1)); for (i = 0; i < Nphotdata; i++) keep[i] = TRUE; - fprintf (stderr, "total of %d photdata\n", Nphotdata); + fprintf (stderr, "total of %lld photdata\n", (long long) Nphotdata); Ndel = 0; @@ -19,5 +19,5 @@ Ndel ++; } - fprintf (stderr, "delete %d photdata\n", Ndel); + fprintf (stderr, "delete %lld photdata\n", (long long) Ndel); if (Ndel == 0) { @@ -31,5 +31,5 @@ Nsubset = Nphotdata - Ndel; ALLOCATE (subset, PhotPars, MAX (1, Nsubset)); - fprintf (stderr, "keeping %d photdata\n", Nsubset); + fprintf (stderr, "keeping %lld photdata\n", (long long) Nsubset); for (j = i = 0; i < Nphotdata; i++) { if (!keep[i]) continue; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/match.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/match.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/match.c (revision 27305) @@ -2,15 +2,15 @@ # include "photreg.h" -int *match_criteria (PhotPars *photdata, int Nphotdata, int *Nmatch) { +off_t *match_criteria (PhotPars *photdata, off_t Nphotdata, off_t *Nmatch) { - int i, j; - int N, NMATCH; - int *match; - int reject; + off_t i, j; + off_t N, NMATCH; + off_t *match; + off_t reject; /* create selection index */ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); /* find entries that matches criteria */ @@ -27,5 +27,5 @@ if (N == NMATCH) { NMATCH += 1000; - REALLOCATE (match, int, NMATCH); + REALLOCATE (match, off_t, NMATCH); } } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/output.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/output.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/photreg/output.c (revision 27305) @@ -6,5 +6,5 @@ /* given a subset list, write out the selected images, if desired */ -void OutputSubset (PhotPars *photdata, int Nphotdata, int *match, int Nmatch) { +void OutputSubset (PhotPars *photdata, off_t Nphotdata, off_t *match, off_t Nmatch) { if (output.table != (char *) NULL) { @@ -23,7 +23,7 @@ /* write out complete binary FITS table in format of db */ -void DumpFitsBintable (char *filename, PhotPars *photdata, int *match, int Nmatch) { - - int i, j; +void DumpFitsBintable (char *filename, PhotPars *photdata, off_t *match, off_t Nmatch) { + + off_t i, j; FILE *f; Header header; @@ -71,5 +71,5 @@ /** add ASCII table to autocode? **/ -void DumpFitsTable (char *filename, PhotPars *photdata, int *index, int Nkeep) { +void DumpFitsTable (char *filename, PhotPars *photdata, off_t *index, off_t Nkeep) { Header header, theader; @@ -80,5 +80,5 @@ char *startstr, *stopstr, *datestr, *line; char *c1, *c2, *code, *photsys, *extname; - int i; + off_t i; time_t tsecond; @@ -196,7 +196,7 @@ /* Select, TimeMode are global */ -int PrintSubset (PhotPars *photdata, int *match, int Nmatch) { - - int i, j; +int PrintSubset (PhotPars *photdata, off_t *match, off_t Nmatch) { + + off_t i, j; char *photstr, *timestr, *c1, *c2, *refcode; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/delete.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/delete.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/delete.c (revision 27305) @@ -2,13 +2,13 @@ # include "spreg.h" -void DeleteSubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch) { +void DeleteSubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch) { - int i, j; - int *keep, Nbad, Nsubset; + off_t i, j; + off_t *keep, Nbad, Nsubset; Spectrum *subset; - ALLOCATE (keep, int, MAX (Nspectrum, 1)); + ALLOCATE (keep, off_t, MAX (Nspectrum, 1)); for (i = 0; i < Nspectrum; i++) keep[i] = TRUE; - fprintf (stderr, "total of %d spectra\n", Nspectrum); + fprintf (stderr, "total of %lld spectra\n", (long long) Nspectrum); Nbad = 0; @@ -19,5 +19,5 @@ Nbad ++; } - fprintf (stderr, "delete %d spectra\n", Nbad); + fprintf (stderr, "delete %lld spectra\n", (long long) Nbad); if (Nbad == 0) { fprintf (stderr, "SUCCESS\n"); @@ -28,5 +28,5 @@ Nsubset = Nspectrum - Nbad; ALLOCATE (subset, Spectrum, MAX (1, Nsubset)); - fprintf (stderr, "keeping %d spectra\n", Nsubset); + fprintf (stderr, "keeping %lld spectra\n", (long long) Nsubset); for (j = i = 0; i < Nspectrum; i++) { if (!keep[i]) continue; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/match.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/match.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/match.c (revision 27305) @@ -2,16 +2,16 @@ # include "spreg.h" -int *match_criteria (Spectrum *spectrum, int Nspectrum, int *Nmatch) { +off_t *match_criteria (Spectrum *spectrum, off_t Nspectrum, off_t *Nmatch) { - int i, j; - int N, NMATCH; - int *match; - int reject; - int Nfilename, Nobject, Ntelescope, Ninstrument; + off_t i, j; + off_t N, NMATCH; + off_t *match; + off_t reject; + off_t Nfilename, Nobject, Ntelescope, Ninstrument; /* create selection index */ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); Nfilename = Nobject = Ntelescope = Ninstrument = 0; @@ -42,5 +42,5 @@ if (N == NMATCH) { NMATCH += 1000; - REALLOCATE (match, int, NMATCH); + REALLOCATE (match, off_t, NMATCH); } } @@ -51,8 +51,8 @@ # if (0) -int *match_spectra (Spectrum *subset, int Nsubset, int *Nmatch) { +off_t *match_spectra (Spectrum *subset, off_t Nsubset, off_t *Nmatch) { - int i, j, N, Nspectrum, Nfound; - int *match; + off_t i, j, N, Nspectrum, Nfound; + off_t *match; Spectrum *spectrum; @@ -60,5 +60,5 @@ /* find matching spectra - very inefficient : sort by obstime, find those first? */ - ALLOCATE (match, int, Nsubset); + ALLOCATE (match, off_t, Nsubset); for (j = 0; j < Nsubset; j++) { match[j] = -1; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/modify.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/modify.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/modify.c (revision 27305) @@ -2,7 +2,7 @@ # include "spreg.h" -void ModifySubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch) { +void ModifySubset (FITS_DB *db, Spectrum *spectrum, off_t Nspectrum, off_t *match, off_t Nmatch) { - int i, j, Nold; + off_t i, j, Nold; char *tmppath; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/output.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/output.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/output.c (revision 27305) @@ -14,5 +14,5 @@ /* given a subset list, write out the selected spectra, if desired */ -void OutputSubset (Spectrum *spectrum, int Nspectra, int *match, int Nmatch) { +void OutputSubset (Spectrum *spectrum, off_t Nspectra, off_t *match, off_t Nmatch) { if (output.table != (char *) NULL) { @@ -29,7 +29,7 @@ /* write out complete binary FITS table in format of db */ -void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch) { +void DumpFitsBintable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch) { - int i, j; + off_t i, j; FILE *f; Header header; @@ -72,7 +72,7 @@ /* write out an ASCII table */ -void DumpFitsTable (char *filename, Spectrum *spectrum, int *match, int Nmatch) { +void DumpFitsTable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch) { - int i; + off_t i; char *obsstr, *regstr, *line, *datestr; time_t tsecond; @@ -141,7 +141,7 @@ /* Select, TimeMode are global */ -int PrintSubset (Spectrum *spectrum, int *match, int Nmatch) { +int PrintSubset (Spectrum *spectrum, off_t *match, off_t Nmatch) { - int i, j; + off_t i, j; char *timestr; @@ -153,5 +153,5 @@ /* predefined subset of values */ - fprintf (stdout, "%5d %20s %s %s %s %s ", i, timestr, spectrum[i].pathname, spectrum[i].filename, spectrum[i].objname, spectrum[i].telescope); + fprintf (stdout, "%5lld %20s %s %s %s %s ", (long long) i, timestr, spectrum[i].pathname, spectrum[i].filename, spectrum[i].objname, spectrum[i].telescope); 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); @@ -161,7 +161,7 @@ } -int dump_data (Spectrum *spectrum, int Nspectrum) { +int dump_data (Spectrum *spectrum, off_t Nspectrum) { - int i; + off_t i; for (i = 0; i < Nspectrum; i++) { Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/unique.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/unique.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/spreg/unique.c (revision 27305) @@ -2,9 +2,9 @@ # include "spreg.h" -void sortstr (char **S, int *X, int N) { +void sortstr (char **S, off_t *X, off_t N) { # define SWAPFUNC(A,B){ \ char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \ - int itmp = X[A]; X[A] = X[B]; X[B] = itmp; \ + off_t itmp = X[A]; X[A] = X[B]; X[B] = itmp; \ } # define COMPARE(A,B)(strcmp(S[A], S[B]) < 0) @@ -18,9 +18,9 @@ /* input is a subset index of spectrum list, output is a new subset */ -int *unique_entries (Spectrum *spectrum, int Nspectrum, int *subset, int *Nmatch) { +off_t *unique_entries (Spectrum *spectrum, off_t Nspectrum, off_t *subset, off_t *Nmatch) { - int i, j, m, Nsubset; - int N, NMATCH; - int *match, *entry; + off_t i, j, m, Nsubset; + off_t N, NMATCH; + off_t *match, *entry; char idxline[128]; char **index; @@ -31,5 +31,5 @@ N = 0; NMATCH = 1000; - ALLOCATE (match, int, NMATCH); + ALLOCATE (match, off_t, NMATCH); Nsubset = *Nmatch; @@ -37,5 +37,5 @@ /* index = filename */ ALLOCATE (index, char *, Nsubset); - ALLOCATE (entry, int, Nsubset); + ALLOCATE (entry, off_t, Nsubset); for (i = 0; i < Nsubset; i++) { sprintf (idxline, "%s", spectrum[subset[i]].filename); @@ -55,5 +55,5 @@ if (N == NMATCH) { NMATCH += 1000; - REALLOCATE (match, int, NMATCH); + REALLOCATE (match, off_t, NMATCH); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/convertimreg.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/convertimreg.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/convertimreg.c (revision 27305) @@ -8,6 +8,6 @@ Header header; RegImage *pimage; - int i, Nimage, status, lockstate, dbstate; - int *match; + off_t i, Nimage, *match, status; + int lockstate, dbstate; get_version (argc, argv, version); @@ -45,5 +45,5 @@ status = fread (pimage, sizeof(RegImage), Nimage, f); if (status != Nimage) { - fprintf (stderr, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status); + fprintf (stderr, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status); fclearlockfile (argv[1], f, lockstate, &dbstate); exit (1); @@ -53,5 +53,5 @@ /* create complete subset */ - ALLOCATE (match, int, Nimage); + ALLOCATE (match, off_t, Nimage); for (i = 0; i < Nimage; i++) match[i] = i; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/detsearch.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/detsearch.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/detsearch.c (revision 27305) @@ -5,5 +5,5 @@ int main (int argc, char **argv) { - int Nmatch, Ndetrend; + off_t Nmatch, Ndetrend; char *dBFile; FITS_DB db; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotmerge.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotmerge.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotmerge.c (revision 27305) @@ -3,16 +3,16 @@ /*** this needs to be written using dvo_image functions !!! ***/ -Image *LoadImageTable (FILE *f, Header *header, int *nimage); +Image *LoadImageTable (FILE *f, Header *header, off_t *nimage); static char *version = "imphotcopy $Revision: 1.6 $"; int main (int argc, char **argv) { + int N, Ntimes; off_t status, Nimage; + off_t i, j, Ninput, *index; Header header, theader; Image *image, *input; FILE *f, *g; - int i, j, N; char *dBFile; - int Ninput, *index, Ntimes; time_t *tstart, *tstop; int VERBOSE, PHOTCODE, dbstate; @@ -92,5 +92,5 @@ /* allocate space for reference lists */ Nin = 0; - ALLOCATE (index, int, Ninput); + ALLOCATE (index, off_t, Ninput); /* these filters are applied to input NOT image */ @@ -159,7 +159,7 @@ size = Nimage*sizeof(Image) + header[0].datasize; if (size != filestatus.st_size) { - Ndata = (filestatus.st_size - header[0].size) / sizeof (Image); + Ndata = (filestatus.st_size - header[0].datasize) / sizeof (Image); fprintf (stderr, "ERROR: image catalog has inconsistent size\n"); - fprintf (stderr, "header: %d, data: %d\n", Nimage, Ndata); + fprintf (stderr, "header: %lld, data: %lld\n", (long long) Nimage, (long long) Ndata); Nimage = Ndata; } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotsearch.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotsearch.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imphotsearch.c (revision 27305) @@ -6,6 +6,6 @@ int main (int argc, char **argv) { - int Nmatch, Nimage; - int *match; + off_t Nmatch, Nimage; + off_t *match; Image *image; FITS_DB db; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregister.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregister.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregister.c (revision 27305) @@ -5,5 +5,5 @@ int main (int argc, char **argv) { - int Nregimage; + off_t Nregimage; RegImage *image, *regimage; FITS_DB db; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregtable.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregtable.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imregtable.c (revision 27305) @@ -5,5 +5,5 @@ int main (int argc, char **argv) { - int Nimage; + off_t Nimage; char *infile; RegImage *image; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imsearch.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imsearch.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imsearch.c (revision 27305) @@ -5,5 +5,5 @@ int main (int argc, char **argv) { - int Nmatch, Nimage, *match; + off_t Nmatch, Nimage, *match; RegImage *image; FITS_DB db; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imstatreg.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imstatreg.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/imstatreg.c (revision 27305) @@ -5,6 +5,6 @@ int main (int argc, char **argv) { - int i, child; - int *match, Nmatch, Nimage, Nsubset; + int child; + off_t i, *match, Nmatch, Nimage, Nsubset; FILE *f; RegImage *image, *subset; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/photsearch.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/photsearch.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/photsearch.c (revision 27305) @@ -6,6 +6,6 @@ char *filename; - int Nmatch, Nphotpars; - int *match; + off_t Nmatch, Nphotpars; + off_t *match; FITS_DB db; PhotPars *photpars; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/spsearch.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/spsearch.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/spsearch.c (revision 27305) @@ -5,5 +5,5 @@ int main (int argc, char **argv) { - int Nmatch, Nspectrum, *match; + off_t Nmatch, Nspectrum, *match; Spectrum *spectrum; FITS_DB db; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libohana/include/ohana_sort.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libohana/include/ohana_sort.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libohana/include/ohana_sort.h (revision 27305) @@ -70,4 +70,5 @@ void dsortpair (double *X, double *Y, int N); void isortpair (int *X, int *Y, int N); +void llsortpair (off_t *X, off_t *Y, off_t N); void fsortthree (float *X, float *Y, float *Z, int N); void dsortthree (double *X, double *Y, double *Z, int N); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libohana/src/sorts.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libohana/src/sorts.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libohana/src/sorts.c (revision 27305) @@ -73,4 +73,20 @@ } +// sort two int vectors by first vector +void llsortpair (off_t *X, off_t *Y, off_t N) { + +# define SWAPFUNC(A,B){ off_t tmp; \ + tmp = X[A]; X[A] = X[B]; X[B] = tmp; \ + tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \ +} +# define COMPARE(A,B)(X[A] < X[B]) + + OHANA_SORT (N, COMPARE, SWAPFUNC); + +# undef SWAPFUNC +# undef COMPARE + +} + void fsortthree (float *X, float *Y, float *Z, int N) { Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/elliprofile.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/elliprofile.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/elliprofile.c (revision 27305) @@ -3,10 +3,10 @@ int elliprofile (int argc, char **argv) { - int i, ix, iy, Nx, Ny, N, center; + int i, ix, iy, Nx, Ny; float *in; - double Rmaj, Rmin, phi, alpha, Io, ARatio; + double Rmaj, Rmin, phi; double root1, root2, R, A1, A2, A3; double Sx, Sy, Sxy; - double x, y, r, f, Xo, Yo; + double x, y, Xo, Yo; Buffer *buf; Vector *rvec, *fvec; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galprofiles.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galprofiles.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galprofiles.c (revision 27305) @@ -5,5 +5,5 @@ int galprofiles (int argc, char **argv) { - int i, j, Nx, Ny, N, Nsec, NELEMENTS; + int i, Nx, Ny, N, Nsec, NELEMENTS; float *in; double theta, dtheta, x, y, Xo, Yo, r, Rmax, value; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradbins.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradbins.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradbins.c (revision 27305) @@ -12,5 +12,5 @@ int i, Nbin; - double Rmin, Rmax; + double Rmax; Vector *fvec, *rvec, *Fvec, *Rvec, *Avec; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradius.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradius.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/galradius.c (revision 27305) @@ -6,11 +6,9 @@ int galradius (int argc, char **argv) { - int i, j, Nx, Ny, N, Nsec, NELEMENTS, Rbin, Nout, above; - double theta, dtheta, x, y, Xo, Yo, r, Rmax, Rmin, value; + int i, j, N, Rbin, Nout, above; + double Rmax, Rmin; double Fmin, Fmax, dF, Fm, Fp, Fo, Rsum, Rnpt, Ro; opihi_flt *flux, *radius, *values; - Buffer *buf; - Vector *fvec, *rvec, *tvec, *Fvec, *Rvec; - char name[128]; + Vector *fvec, *rvec, *Fvec, *Rvec; if (argc != 5) { Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/petrosian.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/petrosian.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/petrosian.c (revision 27305) @@ -4,5 +4,4 @@ int i, above; - float *in; double Fsum, Asum, Area, R_90, rad_90, flux_90; Vector *rvec, *avec, *fvec, *Rvec, *Fvec, *Svec, *Avec; @@ -40,4 +39,5 @@ ResetVector (Avec, OPIHI_FLT, fvec[0].Nelements); + R_90 = 0.1; above = TRUE; Fsum = 0.0; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/region.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/region.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/region.c (revision 27305) @@ -3,5 +3,4 @@ int region (int argc, char **argv) { - char string[256]; double Ra, Dec, Radius; float dx, dy; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.basic/inthash.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.basic/inthash.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.basic/inthash.c (revision 27305) @@ -3,5 +3,5 @@ int inthash (int argc, char **argv) { - int i, N, modulus, value, input; + int N, modulus, value, input; char *varName; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/dbconnect.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/dbconnect.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/dbconnect.c (revision 27305) @@ -47,5 +47,4 @@ gprint (GP_ERR, "failed to set interactive timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } @@ -57,5 +56,4 @@ gprint (GP_ERR, "failed to set wait timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } @@ -71,5 +69,4 @@ gprint (GP_ERR, "failed to get timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } @@ -84,5 +81,4 @@ gprint (GP_ERR, "failed to get timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/relocate.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/relocate.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/relocate.c (revision 27305) @@ -3,5 +3,4 @@ int relocate (int argc, char **argv) { - char *end; int x, y; int N, kapa; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageOps.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageOps.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageOps.c (revision 27305) @@ -1,12 +1,12 @@ # include "dvoshell.h" -void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset, +void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect) { - int i, j, flipped, status, InPic; - int *subset; - int N, n, npts; + int j, flipped, status, InPic; + off_t i, n, *subset; + int npts; double r, d, X, Y, x[4], y[4], Rmin, Rmax, Rmid; Graphdata graph; @@ -44,6 +44,6 @@ npts = 200; - ALLOCATE (subset, int, npts); - n = N = 0; + ALLOCATE (subset, off_t, npts); + n = 0; for (i = 0; i < Nimage; i++) { if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue; @@ -114,9 +114,9 @@ if (n > npts - 1) { npts += 200; - REALLOCATE (subset, int, npts); + REALLOCATE (subset, off_t, npts); } } - REALLOCATE (subset, int, MAX (n, 1)); + REALLOCATE (subset, off_t, MAX (n, 1)); *Subset = subset; *Nsubset = n; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageSelection.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageSelection.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ImageSelection.c (revision 27305) @@ -3,7 +3,7 @@ /* db image table */ static Image *image = NULL; -static int *subset = NULL; -static int Nimage = 0; -static int Nsubset = 0; +static off_t *subset = NULL; +static off_t Nimage = 0; +static off_t Nsubset = 0; static Coords mosaic; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/LoadImages.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/LoadImages.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/LoadImages.c (revision 27305) @@ -1,5 +1,5 @@ # include "dvoshell.h" -Image *LoadImages (int *nimage) { +Image *LoadImages (off_t *Nimage) { int status; @@ -25,5 +25,5 @@ gprint (GP_ERR, "note: image catalog is empty\n"); ALLOCATE (image, Image, 1); - *nimage = 1; + *Nimage = 1; return (image); } @@ -37,5 +37,5 @@ } - image = gfits_table_get_Image (&db.ftable, nimage, &db.swapped); + image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped); return (image); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/Makefile =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/Makefile (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/Makefile (revision 27305) @@ -26,7 +26,7 @@ $(SRC)/compare.$(ARCH).o \ $(SRC)/match_image.$(ARCH).o \ -$(SRC)/photometry.$(ARCH).o \ $(SRC)/dvomisc.$(ARCH).o \ $(SRC)/region_list.$(ARCH).o \ +$(SRC)/photometry.$(ARCH).o \ $(SRC)/dbBooleanCond.$(ARCH).o \ $(SRC)/dbCheckStack.$(ARCH).o \ Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/avextract.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/avextract.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/avextract.c (revision 27305) @@ -3,5 +3,6 @@ int avextract (int argc, char **argv) { - int i, j, n, m, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; + off_t i, j, n, m; + int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; int Nsecfilt, mode, VERBOSE; char **cstack, name[1024]; @@ -79,4 +80,6 @@ /* create output storage vectors */ + Npts = 0; + NPTS = 100; ALLOCATE (values, dbValue, Nfields); ALLOCATE (vec, Vector *, Nreturn); @@ -90,7 +93,4 @@ ResetVector (vec[i], fields[i].type, NPTS); } - - Npts = 0; - NPTS = 1; // grab data from all selected sky regions Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/badimages.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/badimages.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/badimages.c (revision 27305) @@ -8,5 +8,6 @@ int badimages (int argc, char **argv) { - int i, Nimage, entry, First, Cross; + off_t i, Nimage; + int entry, First, Cross; float *ptr; double nominal, big, small, value; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calextract.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calextract.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calextract.c (revision 27305) @@ -5,6 +5,6 @@ int calextract (int argc, char **argv) { - int i, N, Nr, mode[2]; - int Nsecfilt, NSTAR; + off_t i, Nr; + int Nsecfilt, NSTAR, N, mode[2]; PhotCode *code[2]; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calmextract.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calmextract.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/calmextract.c (revision 27305) @@ -6,6 +6,6 @@ int calmextract (int argc, char **argv) { - int i, k, N, Nr, mode[2]; - int NSTAR, Nstar, Nsecfilt; + off_t i, k, Nr; + int NSTAR, Nstar, Nsecfilt, N, mode[2]; Catalog catalog; @@ -169,5 +169,6 @@ int ConcatMeasures (Vector *vec, PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int Nin, int param) { - int i, Ns, N; + off_t i, N; + int Ns; double *value; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ccd.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ccd.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/ccd.c (revision 27305) @@ -4,6 +4,7 @@ double *M1, *M2; - int i, m, k, Npts, NPTS, N; - int N1, N2, i1, i2, mode[4]; + off_t i, m, k, N1, N2, i1, i2; + int Npts, NPTS, N; + int mode[4]; int Nsecfilt, KeepNulls; void *Signal; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmd.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmd.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmd.c (revision 27305) @@ -4,5 +4,6 @@ double *M1, *M3; - int i, j, m, i1, i3, N1, N3, N; + off_t i, j, m, N1, N3, i1, i3; + int N; int Npts, NPTS, mode[3]; int Nsecfilt, KeepNulls; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpReadFile.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpReadFile.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpReadFile.c (revision 27305) @@ -4,7 +4,7 @@ # define BLOCK 1000 -CMPstars *cmpReadFits (FILE *f, int *nstars) { +CMPstars *cmpReadFits (FILE *f, off_t *nstars) { - int i, Nstars; + off_t i, Nstars; Header theader; FTable table; @@ -44,7 +44,8 @@ } -CMPstars *cmpReadText (FILE *f, int *nstars) { +CMPstars *cmpReadText (FILE *f, off_t *nstars) { - int j, N, Nextra, Ninstar, Nskip, Nbytes, nbytes; + off_t N; + int j, Nextra, Ninstar, Nskip, Nbytes, nbytes; int done; char *buffer, *c, *c2; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpread.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpread.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpread.c (revision 27305) @@ -6,6 +6,6 @@ int cmpread (int argc, char **argv) { - off_t Nbytes; - int i, field, Naxis, Nstars; + off_t i, Nbytes, Nstars; + int field, Naxis; double tR, tD; float value; @@ -65,5 +65,5 @@ /* find expected number of stars */ - if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) { + if (!gfits_scan (&header, "NSTARS", "%lld", 1, &Nstars)) { gprint (GP_ERR, "ERROR: can't get NSTARS from header\n"); gfits_free_header (&header); @@ -77,5 +77,5 @@ /* allocate space for stars */ gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]); - if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) { + if (!gfits_scan (&header, "NSTARS", "%lld", 1, &Nstars)) { gprint (GP_ERR, "ERROR: failed to find NSTARS\n"); exit (1); @@ -139,5 +139,5 @@ free (stars); gfits_free_header (&header); - gprint (GP_ERR, "loaded %d objects\n", Nstars); + gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars); return (TRUE); } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/compare.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/compare.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/compare.c (revision 27305) @@ -5,5 +5,5 @@ Vector *rvec, Vector *dvec, Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius) { - int i, j, first_j, Nmatch, NMATCH; + off_t i, j, first_j, Nmatch, NMATCH; double dX, dY, dR; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractAverages.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractAverages.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractAverages.c (revision 27305) @@ -42,5 +42,6 @@ dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) { - int i, Nsec; + off_t i; + int Nsec; dbValue value; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractImages.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractImages.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dbExtractImages.c (revision 27305) @@ -54,5 +54,5 @@ /* return image.field based on the selection */ -dbValue dbExtractImages (Image *image, int Nimage, int N, dbField *field) { +dbValue dbExtractImages (Image *image, off_t Nimage, off_t N, dbField *field) { double x, y; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/detrend.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/detrend.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/detrend.c (revision 27305) @@ -7,5 +7,6 @@ FILE *f; - int i, Nimage, status, N, TimeSelect; + off_t i, Nimage, status; + int N, TimeSelect; char DataBase[256]; time_t tzero, tend; @@ -136,5 +137,5 @@ /* load existing data from database */ - gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage); + gfits_scan (&header, "NIMAGES", "%lld", 1, &Nimage); ALLOCATE (pimage, RegImage, Nimage); status = fread (pimage, sizeof(RegImage), Nimage, f); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dmt.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dmt.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dmt.c (revision 27305) @@ -10,6 +10,7 @@ # if (0) - int i, m, k, N, kapa, SaveVectors; - int Nsec, Nsecfilt, NPTS; + int kapa, SaveVectors; + int Nsec, Nsecfilt; + off_t i, m, k, N, NPTS; double Radius; float dt1, dt2, dmt1, dmt2; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dvomisc.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dvomisc.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/dvomisc.c (revision 27305) @@ -1,7 +1,7 @@ # include "dvoshell.h" -void cprecess (Average *average, int Naverage, double in_epoch, double out_epoch) { +void cprecess (Average *average, off_t Naverage, double in_epoch, double out_epoch) { - int i; + off_t i; double T; double A, D, RA, DEC, zeta, z, theta; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitcolors.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitcolors.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitcolors.c (revision 27305) @@ -10,6 +10,7 @@ int *list, Nlist; - int i, k, m, N, NP1, NP2, NP, Np, Npts, NPTS; - int N1, N2, i1, i2, mode[4]; + off_t i, k, m, N1, N2, i1, i2; + int N, NP1, NP2, NP, Np, Npts, NPTS; + int mode[4]; int Nsecfilt, status; void *oldsignal; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitsed.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitsed.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitsed.c (revision 27305) @@ -24,5 +24,6 @@ int *hashcode; - int i, j, k, m, N, done, Nfit; + off_t i, j, k, m; + int N, done, Nfit; int Nsecfilt, status; void *oldsignal; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gimages.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gimages.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gimages.c (revision 27305) @@ -5,5 +5,6 @@ int gimages (int argc, char **argv) { - int i, j, N, Nimage, Nfound, *subset, Nsubset, status; + off_t i, j, Nimage, *subset, Nsubset; + int N, Nfound, status; double ra, dec, Ra, Dec, X, Y, Yo; double trange, t; @@ -114,5 +115,5 @@ { Coords local; - double Ro, Do, Xo, Yo, Xs, Ys, Xe, Ye, Radius; + double Ro, Do, Xo, Yo, Xs, Ys, Radius; if (typehash == DistortImage) { Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gstar.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gstar.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gstar.c (revision 27305) @@ -12,6 +12,7 @@ double *RA, *DEC; off_t i, Nstars, *N1; - int j, k, m, N, Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST; - int found, GetMeasures, Nlo, Nhi; + off_t j, k, m, N, Nlo, Nhi; + int Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST; + int found, GetMeasures; int SaveVectors; Vector *vec1, *vec2, *vec3, *vec4, *vec5, *vec6; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/images.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/images.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/images.c (revision 27305) @@ -11,5 +11,6 @@ int images (int argc, char **argv) { - int i, j, Nimage, status, InPic, leftside, *plist, TimeSelect, ByName; + off_t i, Nimage; + int j, status, InPic, leftside, *plist, TimeSelect, ByName; int WITH_MOSAIC, SOLO_MOSAIC, HIDDEN; time_t tzero, tend; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdense.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdense.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdense.c (revision 27305) @@ -5,5 +5,6 @@ long A, B; - int i, kapa, N, Nimage, status, NPTS; + off_t i, Nimage; + int kapa, N, status, NPTS; double r, d, x, y, Rmin, Rmax; Vector Xvec, Yvec; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imextract.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imextract.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imextract.c (revision 27305) @@ -3,8 +3,7 @@ int imextract (int argc, char **argv) { - // int *subset, Nsubset; -- not sure if we need to use this or not... - - int i, j, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; - int Nimage, VERBOSE; + off_t i, j, Nimage; + int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; + int VERBOSE; char **cstack, name[1024]; void *Signal; @@ -73,4 +72,6 @@ /* create output storage vectors */ + Npts = 0; + NPTS = 100; ALLOCATE (values, dbValue, Nfields); ALLOCATE (vec, Vector *, Nreturn); @@ -84,7 +85,4 @@ ResetVector (vec[i], fields[i].type, NPTS); } - - Npts = 0; - NPTS = 1; if ((image = LoadImages (&Nimage)) == NULL) goto escape; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imlist.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imlist.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imlist.c (revision 27305) @@ -3,5 +3,6 @@ int imlist (int argc, char **argv) { - int i, j, N, Nimage, *subset, Nsubset, TimeSelect, RegionSelect, TimeFormat, NameSelect; + off_t i, j, Nimage, *subset, Nsubset; + int N, TimeSelect, RegionSelect, TimeFormat, NameSelect; int PhotcodeSelect; time_t tzero, TimeReference; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imphot.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imphot.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imphot.c (revision 27305) @@ -6,5 +6,5 @@ double trange; int N, GreyScale; - int i, j, Nimage, Nsubset, *subset; + off_t i, j, Nimage, Nsubset, *subset; char bufname[64]; float *p; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c (revision 27305) @@ -1,4 +1,4 @@ # include "dvoshell.h" -RegImage *load_imreg (char *DataBase, int *nimage); +RegImage *load_imreg (char *DataBase, off_t *nimage); # define NVALUE 22 @@ -8,5 +8,6 @@ int imrough (int argc, char **argv) { - int i, N, Nimage, TimeSelect; + off_t i, Nimage; + int N, TimeSelect; int ModeSelect, TypeSelect, CCDSelect, FilterSelect, TimeFormat; int type, value, mode, CCD, NVEC; @@ -231,7 +232,8 @@ } -RegImage *load_imreg (char *DataBase, int *nimage) { - - int Nimage, status; +RegImage *load_imreg (char *DataBase, off_t *nimage) { + + off_t Nimage; + int status; char line[80]; FILE *f; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imstats.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imstats.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imstats.c (revision 27305) @@ -3,5 +3,6 @@ int imstats (int argc, char **argv) { - int i, kapa, Nimage, N; + off_t i, Nimage; + int kapa, N; int Mcal, AutoLimits; double r, d; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/match_image.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/match_image.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/match_image.c (revision 27305) @@ -1,7 +1,7 @@ # include "dvoshell.h" -int match_image (Image *image, int Nimage, unsigned int T, short int S) { +off_t match_image (Image *image, off_t Nimage, unsigned int T, short int S) { - int N, Nlo, Nhi, N1, N2; + off_t N, Nlo, Nhi, N1, N2; /* bracket first value of interest */ @@ -37,7 +37,7 @@ } -int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S) { +off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S) { - int N, Nlo, Nhi, N1, N2; + off_t N, Nlo, Nhi, N1, N2; /* bracket first value of interest */ Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/paverage.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/paverage.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/paverage.c (revision 27305) @@ -5,5 +5,6 @@ FILE *f; - int i, j, kapa, Narg, Npts, NPTS, status, VERBOSE; + off_t i, j; + int kapa, Narg, Npts, NPTS, status, VERBOSE; int Nsecfilt, Nsec, Nloaded; double Mz, Mr, mag; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/photometry.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/photometry.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/photometry.c (revision 27305) @@ -555,7 +555,7 @@ /* extract a list of measure parameters from the specified average entry based on the pre-set selections */ -double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) { - - int i, Nlist, NLIST; +double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) { + + off_t i, Nlist, NLIST; double M, *list; @@ -585,5 +585,5 @@ double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) { - int i; + off_t i; double value; @@ -714,5 +714,6 @@ double frac; - int k, Nc, Nt; + int Nc, Nt; + off_t k; Nt = Nc = 0; @@ -730,5 +731,6 @@ int DetermineTypeCode (Average *average, Measure *measure, int code) { - int k, N, Nt[3]; + off_t k; + int N, Nt[3]; Nt[0] = Nt[1] = Nt[2] = 0; @@ -788,5 +790,6 @@ int TestAverage (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) { - int i, Nm, Type, Select; + off_t i, Nm; + int Type, Select; double fwhm, typefrac, dM, Xm; @@ -937,8 +940,8 @@ -double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n) { +double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n) { double *M, mag; - int N; + off_t N; if ((mode == MAG_AVE) || (mode == MAG_REF)) { @@ -960,7 +963,8 @@ /* extract delta-mag pairs applying specified selections */ -double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) { - - int i, j, A1, A2, N1, N2, Np, Nlist, NLIST; +double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) { + + int A1, A2; + off_t i, j, N1, N2, Np, Nlist, NLIST; double *M1, *M2, *list; @@ -1009,7 +1013,8 @@ /* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections - does not return self-matched measurements */ -double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) { - - int i, j, Np0, Np1, Nlist, NLIST; +double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) { + + int Np0, Np1; + off_t i, j, Nlist, NLIST; double *list, M1, M2; @@ -1056,7 +1061,8 @@ /* extract a measurement list matching the number of dmag entries */ -double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) { - - int A1, A2, N1; +double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) { + + off_t N1; + int A1, A2; double *list; @@ -1080,7 +1086,7 @@ /* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections */ -double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) { - - int i, j, n, Nlist, NLIST; +double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) { + + off_t i, j, n, Nlist, NLIST; double *list, M1, M2; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/skycoverage.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/skycoverage.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/skycoverage.c (revision 27305) @@ -6,5 +6,6 @@ int WITH_MOSAIC, SOLO_MOSAIC; - int i, N, Nimage, status, TimeSelect, ByName, xs, ys; + off_t i, Nimage; + int N, status, TimeSelect, ByName, xs, ys; time_t tzero, tend; double pixscale, dX, dY, Npts, r, d, Xi, Yi, Xs, Ys, x[2], y[2], trange, RaCenter, DecCenter; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/data.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/data.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/data.h (revision 27305) @@ -77,5 +77,5 @@ /* in fft.c */ void fft1D (float *dataRe, float *dataIm, int N, int Nbit, int forward); -int fftND (float *dataRe, float *dataIm, int Ndim, int *Nsize, int forward); +int fftND (float *dataRe, float *dataIm, int Ndim, off_t *Nsize, int forward); void dfft1D (double *dataRe, double *dataIm, int N, int Nbit, int forward); int dfftND (double *dataRe, double *dataIm, int Ndim, int *Nsize, int forward); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/dvoshell.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/dvoshell.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/dvoshell.h (revision 27305) @@ -260,10 +260,10 @@ double DetermineTypefrac PROTO((Average *average, Measure *measure, PhotCode *code)); double ExtractAverages PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param)); -double *ExtractByDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); -double *ExtractDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist)); -double *ExtractMagnitudes PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n)); -double *ExtractMeasures PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); -double *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); -double *ExtractMeasuresDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist)); +double *ExtractByDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param)); +double *ExtractDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist)); +double *ExtractMagnitudes PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n)); +double *ExtractMeasures PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param)); +double *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param)); +double *ExtractMeasuresDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist)); void FreeImageSelection PROTO((void)); void FreeImageSelection PROTO((void)); @@ -280,5 +280,5 @@ void FreeDVO PROTO((void)); int InitPhotcodes PROTO((void)); -Image *LoadImages PROTO((int *Nimage)); +Image *LoadImages PROTO((off_t *Nimage)); Image *MatchImage PROTO((unsigned int time, short int source)); Coords *MatchMosaic PROTO((unsigned int time, short int source)); @@ -300,14 +300,11 @@ int TestPhotSelections PROTO((PhotCode **code, int *mode, int param)); void compare PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec, Vector *dvec, Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius)); -void cprecess PROTO((Average *average, int Naverage, double in_epoch, double out_epoch)); -void image_subset PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect)); -int match_image PROTO((Image *image, int Nimage, unsigned int T, short int S)); -int match_image_subset PROTO((Image *image, int *subset, int Nsubset, unsigned int T, short int S)); +void cprecess PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch)); +void image_subset PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect)); +off_t match_image PROTO((Image *image, off_t Nimage, unsigned int T, short int S)); +off_t match_image_subset PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S)); void print_value PROTO((double value, short int ival)); -void sort_image_subset PROTO((Image *image, int *subset, int N)); -void sort_images PROTO((Image *image, int N)); -void sortave PROTO((Average *ave, int N)); -CMPstars *cmpReadFits PROTO((FILE *f, int *nstars)); -CMPstars *cmpReadText PROTO((FILE *f, int *nstars)); +CMPstars *cmpReadFits PROTO((FILE *f, off_t *nstars)); +CMPstars *cmpReadText PROTO((FILE *f, off_t *nstars)); int RD_to_XYpic PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside)); @@ -334,5 +331,5 @@ dbValue dbExtractAverages PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field)); dbValue dbExtractMeasures PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field)); -dbValue dbExtractImages PROTO((Image *image, int Nimage, int N, dbField *field)); +dbValue dbExtractImages PROTO((Image *image, off_t Nimage, off_t N, dbField *field)); void dbInitField PROTO((dbField *field)); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/pantasks.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/pantasks.h (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/pantasks.h (revision 27305) @@ -269,7 +269,4 @@ int CheckJobsGetState (void); -// void *CheckTasksThread (void *data); -// void *CheckJobsThread (void *data); - void CheckControllerSetState (int state); int CheckControllerGetState (void); @@ -287,12 +284,12 @@ void CheckInputs (void); -void ClientThreadLock (void); -void ClientThreadUnlock (void); -void CommandThreadLock (void); -void CommandThreadUnlock (void); -void ControlThreadLock (void); -void ControlThreadUnlock (void); -void JobTaskThreadLock (void); -void JobTaskThreadUnlock (void); +void ClientLock (void); +void ClientUnlock (void); +void CommandLock (void); +void CommandUnlock (void); +void ControlLock (const char *func); +void ControlUnlock (const char *func); +void JobTaskLock (void); +void JobTaskUnlock (void); int InitPassword (void); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/lib.shell/gprint.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/lib.shell/gprint.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/lib.shell/gprint.c (revision 27305) @@ -352,8 +352,8 @@ // there are two strerror_r implementations; choose the right one: #if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) - errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH); -#else strerror_r (myError, errorBuf, MAX_ERROR_LENGTH); errorMsg = errorBuf; +#else + errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH); #endif @@ -362,5 +362,5 @@ va_end (argp); - gprintv (dest, "%s\n", errorMsg); + gprint (dest, "%s\n", errorMsg); return TRUE; } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/JobOps.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/JobOps.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/JobOps.c (revision 27305) @@ -73,7 +73,4 @@ int i; - int status; - char command[1024]; - IOBuffer buffer; gprint (GP_LOG, "\n"); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/ListenClients.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/ListenClients.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/ListenClients.c (revision 27305) @@ -70,5 +70,5 @@ int i, Ncurrent, Nmax, status, Nread; - char *line, log_stdout[128], log_stderr[128]; + char *line; fd_set fdSet; struct timeval timeout; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/status_server.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/status_server.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/status_server.c (revision 27305) @@ -1,3 +1,5 @@ # include "pantasks.h" + +int status_scheduler(void); int status_server (int argc, char **argv) { @@ -103,5 +105,5 @@ } -int status_scheduler() { +int status_scheduler(void) { gprint (GP_LOG, "\n"); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/thread_locks.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/thread_locks.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pantasks/thread_locks.c (revision 27305) @@ -4,9 +4,9 @@ static pthread_mutex_t ClientMutex = PTHREAD_MUTEX_INITIALIZER; -void ClientLock () { +void ClientLock (void) { pthread_mutex_lock (&ClientMutex); } -void ClientUnlock () { +void ClientUnlock (void) { pthread_mutex_unlock (&ClientMutex); } @@ -15,10 +15,10 @@ static pthread_mutex_t CommandMutex = PTHREAD_MUTEX_INITIALIZER; -void CommandLock () { +void CommandLock (void) { // fprintf (stderr, "command lock\n"); pthread_mutex_lock (&CommandMutex); } -void CommandUnlock () { +void CommandUnlock (void) { // fprintf (stderr, "command unlock\n"); pthread_mutex_unlock (&CommandMutex); @@ -28,10 +28,10 @@ static pthread_mutex_t ControlMutex = PTHREAD_MUTEX_INITIALIZER; -void ControlLock (char *func) { +void ControlLock (const char *func) { // fprintf (stderr, "control lock %s\n", func); pthread_mutex_lock (&ControlMutex); } -void ControlUnlock (char *func) { +void ControlUnlock (const char *func) { // fprintf (stderr, "control unlock %s\n", func); pthread_mutex_unlock (&ControlMutex); @@ -41,10 +41,10 @@ static pthread_mutex_t JobTaskMutex = PTHREAD_MUTEX_INITIALIZER; -void JobTaskLock () { +void JobTaskLock (void) { // fprintf (stderr, "jobtask lock\n"); pthread_mutex_lock (&JobTaskMutex); } -void JobTaskUnlock () { +void JobTaskUnlock (void) { // fprintf (stderr, "jobtask unlock\n"); pthread_mutex_unlock (&JobTaskMutex); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/GridOps.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/GridOps.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/GridOps.c (revision 27305) @@ -287,5 +287,5 @@ int **gotstar, **gridmeas; - int i, j, k, N, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys; + int i, j, k, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys; double **A, **B, *Mjx, *Wjx; float Msys, Mcal, Mmos, Merr, Wsys; @@ -498,5 +498,5 @@ gridM[i] = B[i][0]; gridS[i] = sqrt(A[i][i]); - gridN[i] = N; + gridN[i] = Ngood; } Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/StarOps.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/StarOps.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/StarOps.c (revision 27305) @@ -7,5 +7,5 @@ void initMrel (Catalog *catalog, int Ncatalog) { - int i, j; + off_t i, j; Nmax = 0; @@ -34,5 +34,6 @@ int setMrel (Catalog *catalog, int Ncatalog) { - int i, j, k, m, N, Nfew, Nsys, Nbad, Ncal, Nmos, Ngrid; + off_t j, k, m; + int i, N, Nfew, Nsys, Nbad, Ncal, Nmos, Ngrid; float Msys, Mcal, Mmos, Mgrid; StatType stats; @@ -109,5 +110,6 @@ int setMrelOutput (Catalog *catalog, int Ncatalog, int mark) { - int i, j, k, m, N, Nmax; + int i, N; + off_t j, k, m, Nmax; float Msys, Mcal, Mmos, Mgrid; double *list, *dlist; @@ -173,5 +175,6 @@ int setMave (Catalog *catalog, int Ncatalog) { - int i, j, k, m, Ns, Nsecfilt, N, Nmax, Nc; + off_t j, k, m, Nmax; + int i, Ns, Nsecfilt, N, Nc; float Msys; double *list, *dlist; @@ -293,5 +296,6 @@ int setMcalOutput (Catalog *catalog, int Ncatalog) { - int i, j, k, m; + int i; + off_t j, k, m; float Mcal, Mmos, Mgrid; @@ -380,6 +384,7 @@ void clean_measures (Catalog *catalog, int Ncatalog, int final) { - int i, j, k, m, N, Ndel, Nave, Nmax, image_bad, TOOFEW; - int *ilist; + off_t j, k, m, Nmax, Ndel, Nave; + int i, N, image_bad, TOOFEW; + off_t *ilist; double *tlist, *list, *dlist, Ns; float Msys, Mcal, Mmos, Mgrid; @@ -396,5 +401,5 @@ ALLOCATE (list, double, MAX (1, Nmax)); ALLOCATE (dlist, double, MAX (1, Nmax)); - ALLOCATE (ilist, int, Nmax); + ALLOCATE (ilist, off_t, Nmax); ALLOCATE (tlist, double, Nmax); @@ -480,5 +485,5 @@ } initstats (STATMODE); - if (VERBOSE) fprintf (stderr, "%d measures marked poor, %d total\n", Ndel, Nave); + if (VERBOSE) fprintf (stderr, "%lld measures marked poor, %lld total\n", (long long) Ndel, (long long) Nave); free (ilist); free (tlist); @@ -487,5 +492,6 @@ StatType statsStarN (Catalog *catalog, int Ncatalog) { - int i, j, k, m, n, N, Ntot; + off_t j, k, m, Ntot; + int i, n, N; double *list, *dlist; float Mcal, Mmos, Mgrid; @@ -533,5 +539,6 @@ StatType statsStarX (Catalog *catalog, int Ncatalog) { - int i, j, n, Ntot, Xm; + off_t j, Ntot; + int i, n, Xm; double *list, *dlist; StatType stats; @@ -568,5 +575,6 @@ StatType statsStarS (Catalog *catalog, int Ncatalog) { - int i, j, n, Ntot; + int i, n; + off_t j, Ntot; double *list, *dlist; float dM; @@ -603,5 +611,6 @@ void plot_stars (Catalog *catalog, int Ncatalog) { - int i, j, bin; + int i, bin; + off_t j; float dMrel; double *xlist, *Mlist; @@ -634,5 +643,6 @@ void plot_chisq (Catalog *catalog, int Ncatalog) { - int i, j, N, Ntotal, value; + off_t j, Ntotal; + int i, N, value; double *xlist, *ylist; Graphdata graphdata; @@ -665,5 +675,6 @@ void plot_star_coords (Catalog *catalog, int Ncatalog) { - int i, j, N; + int i; + off_t j, N; double *xlist, *ylist; double Xmin, Ymin, Xmax, Ymax; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/bcatalog.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/bcatalog.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/bcatalog.c (revision 27305) @@ -3,6 +3,7 @@ int bcatalog (Catalog *subcatalog, Catalog *catalog) { - int i, j, offset, ecode; - int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm; + off_t i, j, offset; + int ecode; + off_t NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm; float mag; @@ -113,6 +114,6 @@ if (VERBOSE) { - fprintf (stderr, "%d: using %d stars (%d measures) for catalog\n", i, - subcatalog[0].Naverage, subcatalog[0].Nmeasure); + fprintf (stderr, "%d: using %lld stars (%lld measures) for catalog\n", i, + (long long) subcatalog[0].Naverage, (long long) subcatalog[0].Nmeasure); } return (TRUE); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/plot_scatter.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/plot_scatter.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/plot_scatter.c (revision 27305) @@ -3,5 +3,5 @@ void plot_scatter (Catalog *catalog, int Ncatalog) { - int i, j, k, m, N, Ntot; + off_t i, j, k, m, N, Ntot; float Mrel, Mcal, Mmos, Mgrid; double *xlist, *ylist, *ilist; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/relphot_objects.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/relphot_objects.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/relphot_objects.c (revision 27305) @@ -3,5 +3,5 @@ int relphot_objects () { - int i, j, k, m; + off_t i, j, k, m; int Nsecfilt; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/select_images.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/select_images.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/select_images.c (revision 27305) @@ -13,11 +13,11 @@ } SkyRegionCoords; -Image *select_images (SkyList *skylist, Image *timage, int Ntimage, int **LineNumber, int *Nimage) { +Image *select_images (SkyList *skylist, Image *timage, off_t Ntimage, off_t **LineNumber, off_t *Nimage) { Image *image; - int i, j, k, m, found, nimage, NIMAGE; - int InRange, ecode; + off_t i, j, k, m; + off_t *line_number, nimage, NIMAGE; + int InRange, ecode, found; double Ri[5], Di[5], Xi[5], Yi[5], dx, dy; - int *line_number; Coords tcoords; SkyRegionCoords *skycoords; @@ -71,5 +71,5 @@ NIMAGE = 100; ALLOCATE (image, Image, NIMAGE); - ALLOCATE (line_number, int, NIMAGE); + ALLOCATE (line_number, off_t, NIMAGE); // go through the complete list of images, selecting ones which overlap any region @@ -146,5 +146,5 @@ NIMAGE += 100; REALLOCATE (image, Image, NIMAGE); - REALLOCATE (line_number, int, NIMAGE); + REALLOCATE (line_number, off_t, NIMAGE); } } @@ -154,5 +154,5 @@ REALLOCATE (image, Image, MAX (nimage, 1)); - REALLOCATE (line_number, int, MAX (nimage, 1)); + REALLOCATE (line_number, off_t, MAX (nimage, 1)); free (skycoords); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setExclusions.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setExclusions.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setExclusions.c (revision 27305) @@ -3,5 +3,6 @@ int setExclusions (Catalog *catalog, int Ncatalog) { - int i, j, k, m, Narea, Nnocal, Ngood, ecode; + off_t i, j, k, m, Narea, Nnocal, Ngood; + int ecode; Coords *coords; double r, d, x, y; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setMrelFinal.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setMrelFinal.c (revision 27304) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/setMrelFinal.c (revision 27305) @@ -3,5 +3,6 @@ void setMrelFinal (Catalog *catalog) { - int i, j, m, ecode; + off_t i, j, m; + int ecode; /* if we reset the catalog, reset all the current measurements */ @@ -39,5 +40,5 @@ /* set catalog[0].found[i] = FALSE */ - ALLOCATE (catalog[0].found, int, MAX (1, catalog[0].Naverage)); + ALLOCATE (catalog[0].found, off_t, MAX (1, catalog[0].Naverage)); for (i = 0; i < catalog[0].Naverage; i++) { catalog[0].found[i] = FALSE; @@ -66,6 +67,7 @@ void skip_measurements (Catalog *catalog, int pass) { - int i, k, m, ecode, d1, d2; - int Ntot, Ntry, Nkeep, Nskip; + off_t i, k, m; + int ecode, d1, d2; + off_t Ntot, Ntry, Nkeep, Nskip; float mag; @@ -136,6 +138,6 @@ } } - if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %d, Ntry: %d, Nskip: %d, Nkeep: %d\n", - pass, Ntot, Ntry, Nskip, Nkeep); + if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %lld, Ntry: %lld, Nskip: %lld, Nkeep: %lld\n", + pass, (long long) Ntot, (long long) Ntry, (long long) Nskip, (long long) Nkeep); } Index: anches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/sort.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/sort.c (revision 27304) +++ (revision ) @@ -1,182 +1,0 @@ -# include "relphot.h" - -void sortA (double *X, int N) { - - int l,j,ir,i; - double tX; - - if (N < 2) return; - - l = N >> 1; - ir = N - 1; - for (;;) { - if (l > 0) { - l--; - tX = X[l]; - } - else { - tX = X[ir]; - X[ir] = X[0]; - if (--ir == 0) { - X[0] = tX; - return; - } - } - i = l; - j = (l << 1) + 1; - while (j <= ir) { - if (j < ir && X[j] < X[j+1]) j++; - if (tX < X[j]) { - X[i] = X[j]; - j += (i=j) + 1; - } - else j = ir + 1; - } - X[i] = tX; - } -} - -void sortB (double *X, double *Y, int N) { - - int l,j,ir,i; - double tX, tY; - - if (N < 2) return; - - l = N >> 1; - ir = N - 1; - for (;;) { - if (l > 0) { - l--; - tX = X[l]; - tY = Y[l]; - } - else { - tX = X[ir]; - X[ir] = X[0]; - tY = Y[ir]; - Y[ir] = Y[0]; - if (--ir == 0) { - X[0] = tX; - Y[0] = tY; - return; - } - } - i = l; - j = (l << 1) + 1; - while (j <= ir) { - if (j < ir && X[j] < X[j+1]) j++; - if (tX < X[j]) { - X[i] = X[j]; - Y[i] = Y[j]; - j += (i=j) + 1; - } - else j = ir + 1; - } - X[i] = tX; - Y[i] = tY; - } -} - -void sortC (double *X, double *Y, double *F1, double *F2, int N) { - - int l,j,ir,i; - double tX, tY; - double t1, t2; - - if (N < 2) return; - - l = N >> 1; - ir = N - 1; - for (;;) { - if (l > 0) { - l--; - tX = X[l]; - tY = Y[l]; - t1 = F1[l]; - t2 = F2[l]; - } - else { - tX = X[ir]; - X[ir] = X[0]; - tY = Y[ir]; - Y[ir] = Y[0]; - t1 = F1[ir]; - F1[ir] = F1[0]; - t2 = F2[ir]; - F2[ir] = F2[0]; - if (--ir == 0) { - X[0] = tX; - Y[0] = tY; - F1[0] = t1; - F2[0] = t2; - return; - } - } - i = l; - j = (l << 1) + 1; - while (j <= ir) { - if (j < ir && X[j] < X[j+1]) j++; - if (tX < X[j]) { - X[i] = X[j]; - Y[i] = Y[j]; - F1[i] = F1[j]; - F2[i] = F2[j]; - j += (i=j) + 1; - } - else j = ir + 1; - } - X[i] = tX; - Y[i] = tY; - F1[i] = t1; - F2[i] = t2; - } -} - -void sortD (double *X, double *Y, double *Z, int N) { - - int l,j,ir,i; - double tX, tY, tZ; - - if (N < 2) return; - - l = N >> 1; - ir = N - 1; - for (;;) { - if (l > 0) { - l--; - tX = X[l]; - tY = Y[l]; - tZ = Z[l]; - } - else { - tX = X[ir]; - X[ir] = X[0]; - tY = Y[ir]; - Y[ir] = Y[0]; - tZ = Z[ir]; - Z[ir] = Z[0]; - if (--ir == 0) { - X[0] = tX; - Y[0] = tY; - Z[0] = tZ; - return; - } - } - i = l; - j = (l << 1) + 1; - while (j <= ir) { - if (j < ir && X[j] < X[j+1]) j++; - if (tX < X[j]) { - X[i] = X[j]; - Y[i] = Y[j]; - Z[i] = Z[j]; - j += (i=j) + 1; - } - else j = ir + 1; - } - X[i] = tX; - Y[i] = tY; - Z[i] = tZ; - } -}