Changeset 27839 for branches/simmosaic_branches/Ohana/src/tools/src/ftable.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/tools/src/ftable.c (modified) (16 diffs)

branches/simmosaic_branches/Ohana/src/tools/src/ftable.c

@@ -8 +8 @@
 void list_extnames (char *file);
 void print_layout (Header *header);
-int   ByteSwap (char *ptr, int size, int nitems, char *type);
 int Binary;
 
 int main (int argc, char **argv) {
 
-  int i, N, Nx, Ny, Nbytes, Nread;
-  int Nextend, Column, Row, ListExtname, Layout;
+  off_t i, Nx, Ny, Nbytes, Nread, Row;
+  int N, Nextend, Column, ListExtname, Layout;
   char *Extname, *Colname, *line, ttype[80];
   FTable table;
@@ -94 +93 @@
     exit (1);
   }
-  table.size = Nbytes;
-
-  gfits_scan (table.header, "NAXIS1",  "%d", 1, &Nx);
-  gfits_scan (table.header, "NAXIS2",  "%d", 1, &Ny);
+  table.datasize = Nbytes;
+
+  gfits_scan (table.header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
+  gfits_scan (table.header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
 
   /* print a column */
@@ -122 +121 @@
 char *print_table_row (char *row, Header *header) {
   
-  int i, j, Nx, Nfields, Nbytes, Nvals, Oout, Oin;
+  off_t Nx;
+  int i, j, Nfields, Nbytes, Nvals, Oout, Oin;
   char field[16], type[16], format[16], *line;
 
-  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
 
@@ -160 +160 @@
 
   FILE *f;
-  int i, Naxis, Nelem, Ncomp, extend, Nbytes, status;
+  off_t Nbytes, Nelem;
+  int i, Naxis, Ncomp, extend, status;
   char extname[82], exttype[82], axisname[32];
   Header header;
@@ -169 +170 @@
     exit (1);
   }
-
-  /* 
-     if (!gfits_fread_header (f, &header)) {
-     fprintf (stderr, "can't read header from %s\n", file);
-     exit (1);
-     }
-     Nbytes = gfits_data_size (&header);
-     fseek (f, Nbytes, SEEK_CUR);
-  */
 
   fprintf (stdout, "%-30s %-15s NAXIS NAXIS(i)...\n", "extname", "datatype"); 
@@ -217 +209 @@
     for (i = 0; i < Naxis; i++) {
       sprintf (axisname, "NAXIS%d", i+1);
-      status = gfits_scan (&header, axisname,  "%d", 1, &Nelem);
+      status = gfits_scan (&header, axisname,  "%lld", 1, (long long *) &Nelem);
       if (!status) {
         fprintf (stderr, "missing %s\n", axisname);
       }
-      fprintf (stdout, " %7d", Nelem);
+      fprintf (stdout, " %7lld", (long long) Nelem);
     }
     fprintf (stdout, "\n");
@@ -228 +220 @@
     if (Ncomp == 0) {
       extend = FALSE;
-      gfits_scan (&header, "EXTEND", "%t", 1, &extend);
+      gfits_scan_alt (&header, "EXTEND", "%t", 1, &extend);
       if (!extend) {
         fprintf (stderr, "no extensions listed in file\n");
@@ -235 +227 @@
 
     Nbytes = gfits_data_size (&header);
-    fseek (f, Nbytes, SEEK_CUR);
+    fseeko (f, Nbytes, SEEK_CUR);
 
     Ncomp ++;
@@ -245 +237 @@
 FILE *load_extension (char *file, int Nextend, char *Extname, Header *header) {
 
-  int i, extend, Nbytes;
+  off_t Nbytes;
+  int i, extend;
   char extname[82];
   FILE *f;
@@ -264 +257 @@
   /* check for existence of extensions */
   extend = FALSE;
-  gfits_scan (header, "EXTEND", "%t", 1, &extend);
+  gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);
   if (!extend) {
     fprintf (stderr, "no extensions listed in file\n");
@@ -271 +264 @@
   /* skip first data array */
   Nbytes = gfits_data_size (header);
-  fseek (f, Nbytes, SEEK_CUR);
+  fseeko (f, Nbytes, SEEK_CUR);
 
   /* search for extension of interest */
@@ -281 +274 @@
 
     Nbytes = gfits_data_size (header);
-    fseek (f, Nbytes, SEEK_CUR);
+    fseeko (f, Nbytes, SEEK_CUR);
     gfits_free_header (header);
   }
@@ -292 +285 @@
 void print_column (FTable *table, int Column, char *Colname) {
   
-  int i, j, Nfields, Nstart, Nv, Nb, Nx, Ny;
+  off_t Nx, Ny;
+  int i, j, Nfields, Nstart, Nv, Nb;
   Header *header;
   char format[16], field[16], type[16], *line, *data;
@@ -300 +294 @@
 
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
-  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  gfits_scan (header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
+  gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
 
   if (Colname != (char *) NULL) {
@@ -362 +356 @@
             fprintf (stdout, "%d ", *(int *)line);
           }
+          if (!strcmp (type, "int64_t")) {
+            memcpy (line, &data[i*Nv*Nb + Nb*j], Nb);
+            fprintf (stdout, "%lld ", (long long) *(int64_t*)line);
+          }
           if (!strcmp (type, "float")) {
             memcpy (line, &data[i*Nv*Nb + Nb*j], Nb);
@@ -390 +388 @@
     sprintf (field, "TTYPE%d", i);
     gfits_scan (header, field, "%s", 1, type);
-    gfits_scan (header, field, "%C", 1, comment);
+    gfits_scan_alt (header, field, "%C", 1, comment);
     sprintf (field, "TFORM%d", i);
     gfits_scan (header, field, "%s", 1, format);