Changeset 27838 for branches/tap_branches/Ohana/src/libfits/table/F_get_column.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/table/F_get_column.c (modified) (10 diffs)

branches/tap_branches/Ohana/src/libfits/table/F_get_column.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+#include <inttypes.h>
 # define SWAP_BYTE { \
   char tmp; \
@@ -15 +16 @@
   tmp = Pin[3]; Pin[3] = Pin[4]; Pin[4] = tmp; }
 
-void *gfits_get_bintable_column_data (Header *header, FTable *table, char *label, char *type, int *Nrow, int *Ncol) {
-
-  int i, N, Nfields, Nval, Nbytes, Nx, Ny, Nstart, Nv, Nb;
+void *gfits_get_bintable_column_data (Header *header, FTable *table, char *label, char *type, off_t *Nrow, int *Ncol) {
+
+  off_t Nx, Ny;
+  int i, N, Nfields, Nval, Nbytes, Nstart, Nv, Nb;
   char tlabel[80], field[80], format[80], tmpline[16];
   char *Pin, *Pout, *array;
@@ -49 +51 @@
   
   /* check existing table dimensions */
-  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);
 
   /* scan columns to find insert point */
@@ -93 +95 @@
     }
   }
+  if (!strcmp (type, "int64_t")) {
+    for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+      SWAP_DBLE;
+# endif
+      *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
+    }
+  }
   if (!strcmp (type, "float")) {
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
@@ -144 +154 @@
 int gfits_get_bintable_column (Header *header, FTable *table, char *label, void **data) {
 
-  int i, N, Nfields, Nval, Nbytes, Nx, Ny, Nstart, Nv, Nb;
+  off_t Nx, Ny;
+  int i, N, Nfields, Nval, Nbytes, Nstart, Nv, Nb;
   char tlabel[80], field[80], format[80], type[16], tmpline[16];
   char *Pin, *Pout, *array;
@@ -176 +187 @@
   
   /* check existing table dimensions */
-  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);
 
   /* scan columns to find insert point */
@@ -218 +229 @@
 # endif
       *(int *)Pout = *(int *)Pin*Bscale + Bzero;
+    }
+  }
+  if (!strcmp (type, "int64_t")) {
+    for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+      SWAP_DBLE;
+# endif
+      *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
     }
   }
@@ -290 +309 @@
 int gfits_get_table_column (Header *header, FTable *table, char *label, void **data) {
 
-  int i, N, Nfields, Nval, Nbytes, Nx, Ny, Nstart, Nv, Nb;
+  off_t Nx, Ny;
+  int i, N, Nfields, Nval, Nbytes, Nstart, Nv, Nb;
   char tlabel[80], field[80], format[80], cformat[80], type[16], tmp[16];
   char *array, *Pin, *Pout, *line;
@@ -316 +336 @@
   
   /* check existing table dimensions */
-  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);
 
   /* scan columns to find insert point */
@@ -349 +369 @@
     }
   }
+  if (!strcmp (type, "int64_t")) {
+    ALLOCATE (array, char, Ny*8);
+    Pout = array;
+    for (i = 0; i < Ny; i++, Pin+=Nx, Pout+=8) {
+      memcpy (line, Pin, Nval*Nbytes);
+      sscanf (line, "%" PRId64, (int64_t *)Pout);
+    }
+  }
   if (!strcmp (type, "float")) {
     ALLOCATE (array, char, Ny*4);