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

Timestamp:

Jul 17, 2014, 10:14:43 AM (12 years ago)

Author:

eugene

Message:

distinguish "byte" and "char" column fields (char is interpretted as a string)

File:

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

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

@@ -19 +19 @@
   if ((Nv == 0) && (Fchar == format)) Nv = 1;
 
+  // NOTE: X, L, B all are stored in 1-byte columns (X by default has at least room for 8 bits)
+  // I report these as type 'byte' as opposed to 'char', which is interpreted as a string
+
   *Nbytes = 0;
   switch (*Fchar) {
   case  'X':
-    { *Nbytes = 1;  strcpy (type, "char");   *Nval = 1 + (int) Nv / 8; }
+    { *Nbytes = 1;  strcpy (type, "byte");   *Nval = 1 + (int) Nv / 8; }
     break;
   case  'L':
-    { *Nbytes = 1;  strcpy (type, "char");   *Nval = Nv;               }
+    { *Nbytes = 1;  strcpy (type, "byte");   *Nval = Nv;               }
     break;
   case  'A':
@@ -31 +34 @@
     break;
   case  'B':
-    { *Nbytes = 1;  strcpy (type, "char");   *Nval = Nv;               }
+    { *Nbytes = 1;  strcpy (type, "byte");   *Nval = Nv;               }
     break;
   case  'I':
@@ -268 +271 @@
     }
 
+    // Does it make sense to scale 'char' data (as opposed to 'byte')?
     if (!strcmp (type, "char"))   { 
+      for (j = 0; j < Ny; j++) {
+        for (n = 0; n < Nval; n++) {
+          tmpChar = (char *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
+          *tmpChar = *tmpChar * tscale + tzero;
+        }
+      }
+    }
+    if (!strcmp (type, "byte"))   { 
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {
@@ -352 +364 @@
     }
 
+    // does this make sense? (see note above)
     if (!strcmp (type, "char"))   { 
       for (j = 0; j < Ny; j++) {
@@ -360 +373 @@
       }
     }
+    if (!strcmp (type, "byte"))   { 
+      for (j = 0; j < Ny; j++) {
+        for (n = 0; n < Nval; n++) {
+          tmpChar = (char *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
+          *tmpChar = (*tmpChar - tzero) / tscale;
+        }
+      }
+    }
     if (!strcmp (type, "short"))   { 
       for (j = 0; j < Ny; j++) {