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

Timestamp:

Jul 1, 2021, 1:58:44 PM (5 years ago)

Author:

eugene

Message:

fix FITS ASCII column reading

File:

• trunk/Ohana/src/libfits/table/F_table_format.c (modified) (4 diffs)

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

@@ -5 +5 @@
 // get the format of a table column
 // Nval : number of joined columns
-// Nbytes : width of column
+// Nbytes : width of column, determined by the type (e.g., float = 4 bytes)
 int gfits_bintable_format (char *format, char *type, int *Nval, int *Nbytes) {
 
@@ -90 +90 @@
 
 /***********************/
+// get the format of a table column
+// Nval : number of fields (1 for all types except string)
+// Nbytes : width of FITS table column, ie number of bytes in ASCII table
 int gfits_table_format (char *format, char *type, int *Nval, int *Nbytes) {
 
@@ -109 +112 @@
   int isLong = FALSE;
   char Type = 'x';
-  if (Fchar == 'D') { *Nbytes = 1;  strcpy (type, "double"); Type = 'e'; *Nval = Nv; isLong = TRUE; }
-  if (Fchar == 'E') { *Nbytes = 1;  strcpy (type, "float");  Type = 'e'; *Nval = Nv; }
-  if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  Type = 'f'; *Nval = Nv; }
-  if (Fchar == 'I') { *Nbytes = 1;  strcpy (type, "int");    Type = 'd'; *Nval = Nv; }
-  if (Fchar == 'A') { *Nbytes = 1;  strcpy (type, "char");   Type = 's'; *Nval = Nv; }
+  if (Fchar == 'D') { *Nbytes = Nv;  strcpy (type, "double"); Type = 'e'; *Nval =  1; isLong = TRUE; }
+  if (Fchar == 'E') { *Nbytes = Nv;  strcpy (type, "float");  Type = 'e'; *Nval =  1; }
+  if (Fchar == 'F') { *Nbytes = Nv;  strcpy (type, "float");  Type = 'f'; *Nval =  1; }
+  if (Fchar == 'I') { *Nbytes = Nv;  strcpy (type, "int");    Type = 'd'; *Nval =  1; }
+  if (Fchar == 'A') { *Nbytes =  1;  strcpy (type, "char");   Type = 's'; *Nval = Nv; }
   if (!*Nbytes) { return (FALSE); }
   
@@ -133 +136 @@
 /*
   valid TABLE column formats:
-  FN.N  - floating point
-  INN   - integer
+  FN.N  - floating point taking NN characters in the table
+  INN   - integer taking NN characters in the table
   ANN   - NN char string