Changeset 27435 for trunk/Ohana/src/libfits/table/F_table_format.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_table_format.c (modified) (12 diffs)

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -3 +3 @@
 
 /***********************/
+// get the format of a table column
+// Nval : number of joined columns
+// Nbytes : width of column
 int gfits_bintable_format (char *format, char *type, int *Nval, int *Nbytes) {
 
@@ -119 +122 @@
 
 /** extract a table subset to a vtable ***/
-int gfits_table_to_vtable (FTable *ftable, VTable *vtable, int start, int Nkeep) {
+int gfits_table_to_vtable (FTable *ftable, VTable *vtable, off_t start, off_t Nkeep) {
 
   /* gfits_table_to_vtable (f, v, 0, Ny - 1) - keep all of table
@@ -125 +128 @@
   */  
 
-  int i, Nx, Ny;
-
-  gfits_scan (ftable[0].header, "NAXIS1", "%d", 1, &Nx);
-  gfits_scan (ftable[0].header, "NAXIS2", "%d", 1, &Ny);
+  off_t i, Nx, Ny;
+
+  gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
   
   if (start + Nkeep > Ny) return (FALSE);
@@ -134 +137 @@
   if (Nkeep < 0) return (FALSE);
 
-  ALLOCATE (vtable[0].row, int, MAX (1, Nkeep));
+  ALLOCATE (vtable[0].row, off_t, MAX (1, Nkeep));
   ALLOCATE (vtable[0].buffer, char *, MAX (1, Nkeep));
   for (i = 0; i < Nkeep; i++) {
@@ -143 +146 @@
   
   vtable[0].header = ftable[0].header;
-  vtable[0].size = ftable[0].size;
+  vtable[0].datasize = ftable[0].datasize;
   vtable[0].Nrow = Nkeep;
-  vtable[0].pad = vtable[0].size - Nx*Ny;
+  vtable[0].pad = vtable[0].datasize - Nx*Ny;
 
   return (TRUE);
@@ -151 +154 @@
 
 /** convert specified rows to vtable */
-int gfits_vtable_from_ftable (FTable *ftable, VTable *vtable, int *row, int Nrow) {
-
-  int i, N, Nx, Ny;
-
-  gfits_scan (ftable[0].header, "NAXIS1", "%d", 1, &Nx);
-  gfits_scan (ftable[0].header, "NAXIS2", "%d", 1, &Ny);
+int gfits_vtable_from_ftable (FTable *ftable, VTable *vtable, off_t *row, off_t Nrow) {
+
+  off_t i, N, Nx, Ny;
+
+  gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
 
   /* make empty vtable from table */
-  vtable[0].header = ftable[0].header;  /* make this a copy? */
-  vtable[0].size   = ftable[0].size;
-  vtable[0].pad    = vtable[0].size - Nx*Ny;
-  vtable[0].Nrow   = Ny;
+  vtable[0].header   = ftable[0].header;  /* make this a copy? */
+  vtable[0].datasize = ftable[0].datasize;
+  vtable[0].pad      = vtable[0].datasize - Nx*Ny;
+  vtable[0].Nrow     = Ny;
 
   /* insert selected rows in vtable (mask rows marked with -1) */ 
-  ALLOCATE (vtable[0].row, int, Nrow);
+  ALLOCATE (vtable[0].row, off_t, Nrow);
   ALLOCATE (vtable[0].buffer, char *, Nrow);
   for (N = i = 0; i < Nrow; i++) {
@@ -181 +184 @@
 char *gfits_table_print (FTable *table,...) { 
   
-  int i, Nx, Nfields;
-  int off, Nchar, Nval, Nbytes;
+  off_t Nx, off;
+  int i, Nchar, Nval, Nbytes, Nfields;
   char *line, format[64], field[16], type[16];
   va_list argp;
@@ -188 +191 @@
   va_start (argp, table);
 
-  gfits_scan (table[0].header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (table[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
   gfits_scan (table[0].header, "TFIELDS", "%d", 1, &Nfields);
 
@@ -220 +223 @@
 // apply table tzero, tscal in situ (from storage to data)
 int gfits_table_scale_data (FTable *ftable) {
-
-  int i, j, n, Nx, Ny, Nfields;
-  int off, Nchar, Nval, Nbytes, status;
+  
+  off_t Nx, Ny, off;
+  int i, j, n, Nfields;
+  int Nchar, Nval, Nbytes, status;
   char format[64], field[16], type[16];
   double tzero, tscale;
@@ -232 +236 @@
   off = 0;
 
-  gfits_scan (ftable[0].header, "NAXIS1",  "%d", 1, &Nx);
-  gfits_scan (ftable[0].header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
+  gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
   gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
 
@@ -304 +308 @@
 int gfits_table_scale_storage (FTable *ftable) {
 
-  int i, j, n, Nx, Ny, Nfields;
-  int off, Nchar, Nval, Nbytes, status;
+  off_t Nx, Ny, off;
+  int i, j, n, Nfields;
+  int Nchar, Nval, Nbytes, status;
   char format[64], field[16], type[16];
   double tzero, tscale;
@@ -315 +320 @@
   off = 0;
 
-  gfits_scan (ftable[0].header, "NAXIS1",  "%d", 1, &Nx);
-  gfits_scan (ftable[0].header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
+  gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
   gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);