Changeset 38355 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c

Timestamp:

Jun 3, 2015, 4:10:26 AM (11 years ago)

Author:

eugene

Message:

clarify image vs compression buffer vs compressed pixel sizes to allow hcompress and rice

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c (modified) (7 diffs)

branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c

@@ -46 +46 @@
   float zscale, zzero;
 
-  int zdata_pixsize, odata_pixsize;
-
   int *ztile = NULL;
   int *otile = NULL;
@@ -242 +240 @@
 
   // size of an element in the vartable heap section
-  zdata_pixsize = gfits_vartable_heap_pixsize (zdef.format);
+  // zdata_pixsize = gfits_vartable_heap_pixsize (zdef.format); XXX
 
   // size of a pixel in the final image (not needed)
@@ -248 +246 @@
 
   // size of a pixel in the output from the decompression routine
-  odata_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
-
-  int Nout_alloc = odata_pixsize*max_tile_size;
+  int cmp_pixsize = gfits_compressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
+  int raw_bitpix  = gfits_uncompressed_data_bitpix (cmptype, header[0].bitpix, optname, optvalue, Noptions);
+  int raw_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
+
+  int Nout_alloc = raw_pixsize*max_tile_size;
   ALLOCATE (out, char, Nout_alloc);
 
   off_t row;
+
+  if (0) { 
+    int k;
+    fprintf (stderr, "unc tbl: "); 
+    for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", ftable->buffer[k]); } 
+    fprintf (stderr, "\n");
+  }
 
   // uncompress the data
@@ -266 +273 @@
     if (!zdata) ESCAPE;
 
-    // XXX not certain this is the correct place to do the swap (or if zdata_pixsize is
-    // the correct size to guide the swap)
-
     if (strcasecmp(cmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (zdata, Nzdata, zdata_pixsize)) ESCAPE;
+      if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;
+    }
+
+    if (0 && (row == 0)) {
+      int k;
+      fprintf (stderr, "unc dat: "); 
+      for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", zdata[k]); } 
+      fprintf (stderr, "\n");
     }
 
     // gfits_uncompress_data uncompresses from zdata to the temporary output buffer which must be allocated
     // XXX the tile must not be > 2GB
-    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, odata_pixsize)) ESCAPE;
-
+    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, raw_pixsize)) ESCAPE;
+
+    if (0 && (row == 0)) {
+      int k;
+      fprintf (stderr, "unc swp: "); 
+      for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", out[k]); } 
+      fprintf (stderr, "\n");
+    }
+    
     if (!strcasecmp(cmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (out, Nout, odata_pixsize)) ESCAPE;
+      if (!gfits_byteswap_zdata (out, Nout, raw_pixsize)) ESCAPE;
+    }
+    
+    if (0 && (row == 0)) {
+      int k;
+      fprintf (stderr, "unc raw: "); 
+      for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", out[k]); } 
+      fprintf (stderr, "\n");
     }
 
     // copy the uncompressed pixels into their correct locations            
-    if (!gfits_distribute_data (matrix, odata_pixsize, out, Nout, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
+    if (!gfits_distribute_data (matrix, out, Nout, raw_bitpix, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
+
+    if (0 && (row == 0)) {
+      int k;
+      fprintf (stderr, "unc mat: "); 
+      for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", matrix->buffer[k]); } 
+      fprintf (stderr, "\n");
+    }
 
     // update the tile counters, carrying to the next dimension if needed
@@ -311 +343 @@
 
 // bitpix is the input data size/type
-int gfits_distribute_data (Matrix *matrix, int bitpix, char *data, int Ndata, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero) {
+int gfits_distribute_data (Matrix *matrix, char *raw, int Nraw, int raw_bitpix, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero) {
 
   int i, j, start, offset, coord, Nline;
@@ -334 +366 @@
 
   // double check reported size (needs the Isize)
-  assert (Ndata == Ztile[0]*Nline);
+  assert (Nraw == Ztile[0]*Nline);
 
   // set the starting point of the tile:
@@ -350 +382 @@
   // we need to set up switches for all of the possible combinations:
   // this macro is used at the inner switch to run the actual loop
-# define SCALE_AND_DIST(TYPE, SIZE) { \
-    TYPE *Optr = (TYPE *) &matrix->buffer[SIZE*(offset + start)]; \
-    for (j = 0; j < Ztile[0]; j++, Iptr++, Optr++) { \
-      if (*Iptr == zblank) { \
-          *Optr = oblank;    \
-      } else { \
-          *Optr = *Iptr * zscale + zzero;       \
+# define SCALE_AND_DIST_INT(TYPE, SIZE) {                               \
+    TYPE *TILEptr = (TYPE *) &matrix->buffer[SIZE*(offset + start)];    \
+    for (j = 0; j < Ztile[0]; j++, TILEptr++, RAWptr++) {               \
+      if (*TILEptr == zblank) {                                         \
+        *TILEptr = oblank;                                              \
+      } else {                                                          \
+        *TILEptr = *RAWptr * zscale + zzero;                            \
       } } }
 
+  // we need to set up switches for all of the possible combinations:
+  // this macro is used at the inner switch to run the actual loop
+# define SCALE_AND_DIST_FLOAT(TYPE, SIZE) {                             \
+    TYPE *TILEptr = (TYPE *) &matrix->buffer[SIZE*(offset + start)];    \
+    for (j = 0; j < Ztile[0]; j++, TILEptr++, RAWptr++) {               \
+      if (!isfinite(*TILEptr)) {                                        \
+        *TILEptr = oblank;                                              \
+      } else {                                                          \
+        *TILEptr = *RAWptr * zscale + zzero;                            \
+      } } }
+  
   // this macro sets up the outer switch and calls above macro with all output bitpix options
-# define SETUP_INSIZE(TYPE, SIZE) { \
-    TYPE *Iptr = (TYPE *) &data[i*SIZE*Ztile[0]]; \
-    switch (matrix->bitpix) { \
-      case 8: \
-        SCALE_AND_DIST (char, 1); \
-        break; \
-      case 16: \
-        SCALE_AND_DIST (short, 2); \
-        break; \
-      case 32: \
-        SCALE_AND_DIST (int, 4); \
-        break; \
-      case -32: \
-        SCALE_AND_DIST (float, 4); \
-        break; \
-      case -64: \
-        SCALE_AND_DIST (double, 8); \
-        break; \
-      default: \
-        abort(); \
+# define SETUP_RAWSIZE(TYPE, SIZE) {               \
+    TYPE *RAWptr = (TYPE *) &raw[i*SIZE*Ztile[0]]; \
+    switch (matrix->bitpix) {                      \
+      case   8: SCALE_AND_DIST_INT   (char,   1); break; \
+      case  16: SCALE_AND_DIST_INT   (short,  2); break; \
+      case  32: SCALE_AND_DIST_INT   (int,    4); break; \
+      case -32: SCALE_AND_DIST_FLOAT (float,  4); break; \
+      case -64: SCALE_AND_DIST_FLOAT (double, 8); break; \
+      default:  abort(); \
     } }
 
   // loop over lines in the tile
   for (i = 0; i < Nline; i++) {
-    switch (bitpix) {
-      case 1:
-        SETUP_INSIZE (char, 1);
-        break;
-      case 2: 
-        SETUP_INSIZE (short, 2);
-        break; 
-      case 4:
-        SETUP_INSIZE (int, 4);
-        break;
-      case 8:
-        SETUP_INSIZE (double, 8);
-        break;
-      default:
-        abort();
+    switch (raw_bitpix) {
+      case   8: SETUP_RAWSIZE (char,   1); break;
+      case  16: SETUP_RAWSIZE (short,  2); break; 
+      case  32: SETUP_RAWSIZE (int,    4); break;
+      case -32: SETUP_RAWSIZE (float,  4); break;
+      case -64: SETUP_RAWSIZE (double, 8); break;
+      default:  abort();
     }