Changeset 38366 for branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_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_uncompress_T.c (modified) (6 diffs)

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

@@ -13 +13 @@
 # if (VERBOSE_DUMP)
   int i;
-  fprintf (stderr, "%s data: ", message);
-  // for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
-  for (i = 0; i < 16; i++) {
-    fprintf (stderr, "0x%02hhx ", table->buffer[i]);
+  fprintf (stderr, "%s data:\n", message);
+  for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
+    // for (i = 0; i < 16; i++) {
+    fprintf (stderr, "%02hhx", table->buffer[i]);
+    if (i % 2) fprintf (stderr, " ");
+    if (i % 32 == 31) fprintf (stderr, "\n");
   }
   fprintf (stderr, "\n");
@@ -26 +28 @@
 # if (VERBOSE_DUMP)
   int i;
-  fprintf (stderr, "%s pntr: ", message);
-  for (i = 0; (i < 16) && (i < table->header->Naxis[0]*table->header->Naxis[1]); i++) {
-    fprintf (stderr, "0x%02hhx ", table->buffer[i]);
+  fprintf (stderr, "%s pntr:\n", message);
+  for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
+    fprintf (stderr, "%02hhx", table->buffer[i]);
+    if (i % 2) fprintf (stderr, " ");
+    if (i % 32 == 31) fprintf (stderr, "\n");
   }
   fprintf (stderr, "\n");
 
-  fprintf (stderr, "%s data: ", message);
-  for (i = 0; (i < 16) && (i < table->header->pcount); i++) {
-    fprintf (stderr, "0x%02hhx ", table->buffer[table->heap_start + i]);
+  fprintf (stderr, "%s data:\n", message);
+  for (i = 0; i < table->header->pcount; i++) {
+    fprintf (stderr, "%02hhx", table->buffer[table->heap_start + i]);
+    if (i % 2) fprintf (stderr, " ");
+    if (i % 32 == 31) fprintf (stderr, "\n");
   }
   fprintf (stderr, "\n");
@@ -156 +162 @@
       if (!zdata) ESCAPE;
     
-      if (strcasecmp(fields[i].zctype, "GZIP_1") && strcasecmp(fields[i].zctype, "GZIP_2") && strcasecmp(fields[i].zctype, "RICE_1")) {
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "u4: ");
+        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[i].zctype, "NONE") && 
+          strcasecmp(fields[i].zctype, "NONE_2") && 
+          strcasecmp(fields[i].zctype, "GZIP_1") && 
+          strcasecmp(fields[i].zctype, "GZIP_2") && 
+          strcasecmp(fields[i].zctype, "RICE_1") && 
+          strcasecmp(fields[i].zctype, "RICE_ONE")) {
         // Nzdata is number of bytes
         if (!gfits_byteswap_zdata (zdata, Nzdata, fields[i].pixsize)) ESCAPE;
       }
 
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "u3: ");
+        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");
+      }
+
       int Nrows = (row == Ntile - 1) ? ztilelast : ztilelen;
-      int Nraw = Nraw_alloc; // expected number of pixel: Nrows*fields[i].Nvalues
-      if (!gfits_uncompress_data (zdata, Nzdata, fields[i].zctype, NULL, NULL, 0, raw, &Nraw, fields[i].pixsize)) ESCAPE;
+      int Nraw = Nrows*fields[i].Nvalues*fields[i].pixsize; // expected number of bytes
+      if (!gfits_uncompress_data (zdata, Nzdata, fields[i].zctype, NULL, NULL, 0, raw, &Nraw, Nraw_alloc, fields[i].pixsize)) ESCAPE;
+
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "u2: ");
+        for (k = 0; k < Nraw*fields[i].pixsize; k++) {
+          fprintf (stderr, "%02hhx", raw[k]);
+          if (k % 2) fprintf (stderr, " ");
+          // if (k % 32 == 31) fprintf (stderr, "\n");
+        }
+        fprintf (stderr, "\n");
+      }
 
       if (!strcasecmp(fields[i].zctype, "GZIP_1")) {
@@ -170 +214 @@
       }
 
+      if (VERBOSE_DUMP) {
+        int k;
+        fprintf (stderr, "u1: ");
+        for (k = 0; k < Nraw*fields[i].pixsize; k++) {
+          fprintf (stderr, "%02hhx", raw[k]);
+          if (k % 2) fprintf (stderr, " ");
+          // if (k % 32 == 31) fprintf (stderr, "\n");
+        }
+        fprintf (stderr, "\n");
+      }
+
       // int valid = (row == 0) && (i == 0);
 
@@ -177 +232 @@
 
       // copy the raw pixels from their native matrix locations to the temporary output buffer
-      if (!strcasecmp(fields[i].zctype, "GZIP_2")) {
+      if (!strcasecmp(fields[i].zctype, "GZIP_2") || !strcasecmp(fields[i].zctype, "NONE_2")) {
         if (!gfits_distribute_table_gzp2 (tgttable, &fields[i], raw, row_start, Nrows)) ESCAPE;
       } else {
@@ -233 +288 @@
     for (i = 0; i < Nrows; i++) {
       int row = row_start + i;
-      char *src = &raw[i*field->rowsize + k*Nrows*field->Nvalues];
-      char *tgt = &table->buffer[Nx*row + field->offset + k];
-      for (j = 0; j < field->Nvalues; j++, tgt+=field->pixsize, src++) {
-        *tgt = *src;
+      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++) {
+        *tblptr = *rawptr;
       }
     }