Changeset 41676 for trunk/Ohana/src/libfits/table/F_get_column.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_get_column.c (modified) (3 diffs)

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

@@ -310 +310 @@
    C - complex float
    M - complex double
-   P - var lenght array descrpt (64 bit)
+   P - var length array descrpt (64 bit)
    
    all can be preceeded by integer N which specified number
@@ -341 +341 @@
 
   if (!gfits_table_format (format, type, Nval, &Nbytes)) return (FALSE);
-  *Nval = 1;
 
   return (TRUE);
@@ -379 +378 @@
   gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1,  &Ny);
 
-  /* scan columns to find insert point */
-  Nstart = 0;
-  for (i = 1; i < N; i++) {
-    snprintf (field, 256, "TFORM%d", i);
-    gfits_scan (header, field, "%s", 1, format);
-    gfits_table_format (format, tmp, &Nv, &Nb);
-    Nstart += Nv*Nb;
+  // find the starting byte for this column
+  // FITS ASCII table is supposed to have TBCOLn to specify the starting point
+  // but if it is missing, we can try to find by counting
+  snprintf (field, 256, "TBCOL%d", N);
+  int status = gfits_scan (header, field, "%d", 1, &Nstart);
+  if (!status) {
+    /* scan columns to find insert point */
+    Nstart = 0;
+    for (i = 1; i < N; i++) {
+      snprintf (field, 256, "TFORM%d", i);
+      gfits_scan (header, field, "%s", 1, format);
+      gfits_table_format (format, tmp, &Nv, &Nb);
+      Nstart += Nv*Nb;
+    }
+  } else {
+    Nstart --;
   }
 
   /* allocate temporary line, init pointers */
-  ALLOCATE (line, char, Nval+1);
-  bzero (line, Nval+1);
+  ALLOCATE (line, char, Nval*Nbytes+1);
+  bzero (line, Nval*Nbytes+1);
   Pin  = table[0].buffer + Nstart;