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

Timestamp:

Jun 4, 2015, 5:42:47 PM (11 years ago)

Author:

eugene

Message:

libfits compressed I/O seems to be generally working

File:

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

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

@@ -2 +2 @@
 # include <gfitsio.h>
 # include <zlib.h>
+# define VERBOSE_DUMP 0
 
 // the user needs to specify the various compression options:
@@ -36 +37 @@
 
   int Ntile, ztilelast;
+  if (!ztilelen) ztilelen = srcheader->Naxis[1];
+
   if (srcheader->Naxis[1] % ztilelen) {
     Ntile = srcheader->Naxis[1] / ztilelen + 1;
@@ -75 +78 @@
     if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].tformat_cmt)) ESCAPE;
 
-    // XXX this should depend on the field type, but for now just use a single type (GZIP_1)
+    // for now we set all fields to the requested type
     strcpy (fields[i].zctype, zcmptype);
 
@@ -125 +128 @@
     max_width = MAX(max_width, fields[i].rowsize);
 
+    // RICE can only be used on integer fields
+    if (!strcasecmp (fields[i].zctype, "RICE_1") || !strcasecmp (fields[i].zctype, "RICE_ONE")) {
+      if (!strcmp (fields[i].datatype, "float") || !strcmp (fields[i].datatype, "double")) {
+        strcpy (fields[i].zctype, "GZIP_2");
+      }
+    }
+
     // compression type per column (XXX for now we are just using zcmptype, as set above)
     snprintf (keyword, 81, "ZCTYP%d", i+1);
@@ -152 +162 @@
 
       // copy the raw pixels from their native matrix locations to the temporary output buffer
-      if (!strcasecmp(fields[i].zctype, "GZIP_2")) {
+      if (!strcasecmp(fields[j].zctype, "GZIP_2") || !strcasecmp(fields[j].zctype, "NONE_2")) {
         if (!gfits_collect_table_gzp2 (srctable, &fields[j], raw, row_start, Nrows)) ESCAPE;
       } else {
@@ -158 +168 @@
       }
       
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "c1: ");
+        for (k = 0; k < Nrows*fields[j].Nvalues*fields[j].pixsize; k++) {
+          fprintf (stderr, "%02hhx", raw[k]);
+          if (k % 2) fprintf (stderr, " ");
+          // if (k % 32 == 31) fprintf (stderr, "\n");
+        }
+        fprintf (stderr, "\n");
+      }
+
       // optname, optvalue = NULL, Noptions = 0
       
       int Nraw = Nrows*fields[j].Nvalues; // number of pixels
-      if (!strcmp(fields[j].zctype, "GZIP_1")) {
+      if (!strcasecmp(fields[j].zctype, "GZIP_1")) {
         if (!gfits_byteswap_zdata (raw, Nraw * fields[j].pixsize, fields[j].pixsize)) ESCAPE;
+      }
+
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "c2: ");
+        for (k = 0; k < Nrows*fields[j].Nvalues*fields[j].pixsize; k++) {
+          fprintf (stderr, "%02hhx", raw[k]);
+          if (k % 2) fprintf (stderr, " ");
+          // if (k % 32 == 31) fprintf (stderr, "\n");
+        }
+        fprintf (stderr, "\n");
       }
 
@@ -168 +200 @@
       if (!gfits_compress_data (zdata, &Nzdata, fields[j].zctype, NULL, NULL, 0, raw, Nraw, fields[j].pixsize, 0, 0)) ESCAPE;
       
-      if (strcasecmp(fields[j].zctype, "GZIP_1") && strcasecmp(fields[j].zctype, "GZIP_2") && strcasecmp(fields[j].zctype, "RICE_1")) {
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "c3: ");
+        for (k = 0; k < Nzdata; k++) {
+          fprintf (stderr, "%02hhx", zdata[k]);
+          if (k % 2) fprintf (stderr, " ");
+          // if (k % 32 == 31) fprintf (stderr, "\n");
+        }
+        fprintf (stderr, "\n");
+      }
+
+      if (strcasecmp(fields[j].zctype, "NONE") &&
+          strcasecmp(fields[j].zctype, "NONE_2") &&
+          strcasecmp(fields[j].zctype, "GZIP_1") &&
+          strcasecmp(fields[j].zctype, "GZIP_2") && 
+          strcasecmp(fields[j].zctype, "RICE_1") && 
+          strcasecmp(fields[j].zctype, "RICE_ONE")) {
         if (!gfits_byteswap_zdata (zdata, Nzdata, fields[j].pixsize)) ESCAPE;
+      }
+
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "c4: ");
+        for (k = 0; k < Nzdata; k++) {
+          fprintf (stderr, "%02hhx", zdata[k]);
+          if (k % 2) fprintf (stderr, " ");
+          // if (k % 32 == 31) fprintf (stderr, "\n");
+        }
+        fprintf (stderr, "\n");
       }
 
@@ -228 +287 @@
     for (i = 0; i < Nrows; i++) {
       int row = row_start + i;
-      char *tgt = &raw[i*field->rowsize + k*Nrows*field->Nvalues];
-      char *src = &table->buffer[Nx*row + field->offset + k];
-      for (j = 0; j < field->Nvalues; j++, tgt+=field->pixsize, src++) {
-        *tgt = *src;
-        myAssert (src - raw < field->
+      char *rawptr = &raw[i*field->Nvalues + k*Nrows*field->Nvalues];
+# ifdef BYTE_SWAP      
+      char *tblptr = &table->buffer[Nx*row + field->offset + (field->pixsize - k - 1)];
+# else
+      char *tblptr = &table->buffer[Nx*row + field->offset + k];
+# endif
+      for (j = 0; j < field->Nvalues; j++, tblptr += field->pixsize, rawptr++) {
+        *rawptr = *tblptr;
+        myAssert (rawptr - raw < Nrows*field->Nvalues*field->pixsize, "oops");
+        myAssert (tblptr - table->buffer < table->header->Naxis[0]*table->header->Naxis[1], "oops");
       }
     }