Changeset 38399 for branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

Timestamp:

Jun 5, 2015, 7:58:50 PM (11 years ago)

Author:

eugene

Message:

handle zzero,zscale = 0,1 specially to avoid bitlevel errors

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

@@ -78 +78 @@
     if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].tformat_cmt)) ESCAPE;
 
-    // for now we set all fields to the requested type
+    // for now we set all fields to the requested type.  since I do not yet know the column data types I cannot yet assign automatic cmptypes
     strcpy (fields[i].zctype, zcmptype);
 
@@ -127 +127 @@
     fields[i].rowsize = fields[i].Nvalues*fields[i].pixsize;
     max_width = MAX(max_width, fields[i].rowsize);
+
+    if (!strcasecmp (fields[i].zctype, "AUTO")) {
+      if (!strcmp (fields[i].datatype, "float") || 
+          !strcmp (fields[i].datatype, "double")|| 
+          !strcmp (fields[i].datatype, "int64_t")) {
+        strcpy (fields[i].zctype, "GZIP_2");
+        goto got_cmptype;
+      }
+      if (!strcmp (fields[i].datatype, "byte") ||
+          !strcmp (fields[i].datatype, "short") ||
+          !strcmp (fields[i].datatype, "int")) {
+        strcpy (fields[i].zctype, "RICE_1");
+        goto got_cmptype;
+      }
+      if (!strcmp (fields[i].datatype, "char")) {
+        strcpy (fields[i].zctype, "GZIP_1");
+        goto got_cmptype;
+      }
+    }
+  got_cmptype:
+
 
     // RICE can only be used on integer fields