Changeset 33648 for trunk/Ohana/src/libfits/table/F_get_column.c

Timestamp:

Apr 1, 2012, 2:22:08 PM (14 years ago)

Author:

eugene

Message:

fix byteswap error for 64bit tables (simplify byteswap code generally to clean up); add function to get type of specified column by seq number; defaults for Bzero and Bscale in tables without temp (0.0,1.0); function to set a bintable column from a vector of different type; better error handling for F_print,F_modify

File:

• trunk/Ohana/src/libfits/table/F_get_column.c (modified) (2 diffs)

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

@@ -126 +126 @@
 
 /***********************/
+int gfits_get_bintable_column_type_by_N (Header *header, int N, char *type, int *Nval) {
+
+  int Nbytes;
+  char field[80], format[80];
+
+  assert (N > 0);
+
+  sprintf (field, "TFORM%d", N);
+  if (!gfits_scan (header, field, "%s", 1, format)) return FALSE;
+  if (!gfits_bintable_format (format, type, Nval, &Nbytes)) return (FALSE);
+  return (TRUE);
+}
+
+/***********************/
 int gfits_get_bintable_column_type (Header *header, char *label, char *type, int *Nval) {
 
-  int i, N, Nfields, Nbytes;
-  char tlabel[80], field[80], format[80];
+  int i, N, Nfields;
+  char tlabel[80], field[80];
 
   if (label == (char *) NULL) return (FALSE);
@@ -144 +158 @@
   N = i - 1;
 
-  sprintf (field, "TFORM%d", N);
-  gfits_scan (header, field, "%s", 1, format);
-
-  if (!gfits_bintable_format (format, type, Nval, &Nbytes)) return (FALSE);
+  if (!gfits_get_bintable_column_type_by_N (header, N, type, Nval)) return FALSE;
   return (TRUE);
 }