Changeset 38363 for branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_T.c

Timestamp:

Jun 4, 2015, 8:49:25 AM (11 years ago)

Author:

eugene

Message:

rice and gzip2 both work for images; working on tables

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_T.c (modified) (13 diffs)

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

@@ -3 +3 @@
 # include <zlib.h>
 
-# define ESCAPE(A) { fprintf (stderr, "error in %s @ line %d\n", __func__, __LINE__); goto escape; }
-
-int gfits_distribute_table_data (FTable *table, char *raw, int col, int row_start, int Nrows, int rowsize);
+# define ESCAPE { fprintf (stderr, "error in %s @ line %d\n", __func__, __LINE__); goto escape; }
+
+int gfits_distribute_table_data (FTable *table, TableField *field, char *raw, int row_start, int Nrows);
+int gfits_distribute_table_gzp2 (FTable *table, TableField *field, char *raw, int row_start, int Nrows);
 
 # define VERBOSE_DUMP 0
@@ -53 +54 @@
 
   int ztilelen;
-  if (!gfits_scan (srcheader, "ZTILELEN", "%d", 1, &ztilelen)) ESCAPE(A);
+  if (!gfits_scan (srcheader, "ZTILELEN", "%d", 1, &ztilelen)) ESCAPE;
   // XXX if ZTILELEN is missing, it should have the value of ZNAXIS2
 
@@ -63 +64 @@
 
   // creates an empty (Naxes = 2, Naxis[i] = 0) table header with XTENSION = BINTABLE, EXTNAME = COMPRESSED_TABLE
-  if (!gfits_create_table_header (tgtheader, "BINTABLE", extname)) ESCAPE(A);
+  if (!gfits_create_table_header (tgtheader, "BINTABLE", extname)) ESCAPE;
 
   int Nfields;
-  if (!gfits_scan (srcheader, "TFIELDS", "%d", 1, &Nfields)) ESCAPE(A);
+  if (!gfits_scan (srcheader, "TFIELDS", "%d", 1, &Nfields)) ESCAPE;
 
   // below we generate a fake table with tmpbuffers.  allocated it to the max needed size
@@ -76 +77 @@
   for (i = 0; i < Nfields; i++) {
     snprintf (keyword, 80, "TTYPE%d", i+1);
-    if (!gfits_scan (srcheader, keyword, "%s", 1, fields[i].ttype)) ESCAPE(A);
-    if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].ttype_cmt)) ESCAPE(A);
+    if (!gfits_scan (srcheader, keyword, "%s", 1, fields[i].ttype)) ESCAPE;
+    if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].ttype_cmt)) ESCAPE;
 
     // TUNIT is not mandatory
@@ -84 +85 @@
       fields[i].tunit[0] = 0;
     } else {
-      if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].tunit_cmt)) ESCAPE(A);
+      if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].tunit_cmt)) ESCAPE;
     }
     
     snprintf (keyword, 80, "ZFORM%d", i+1);
-    if (!gfits_scan (srcheader, keyword, "%s", 1, fields[i].tformat)) ESCAPE(A);
-    if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].tformat_cmt)) ESCAPE(A);
+    if (!gfits_scan (srcheader, keyword, "%s", 1, fields[i].tformat)) ESCAPE;
+    if (!gfits_scan_alt (srcheader, keyword, "%C", 1, fields[i].tformat_cmt)) ESCAPE;
 
     snprintf (keyword, 80, "ZCTYP%d", i+1);
@@ -96 +97 @@
     }
 
-    if (!gfits_bintable_format (fields[i].tformat, fields[i].datatype, &fields[i].Nvalues, &fields[i].pixsize)) ESCAPE(A);
+    if (!gfits_bintable_format (fields[i].tformat, fields[i].datatype, &fields[i].Nvalues, &fields[i].pixsize)) ESCAPE;
     fields[i].rowsize = fields[i].Nvalues*fields[i].pixsize;
     max_width = MAX(max_width, fields[i].rowsize);
@@ -103 +104 @@
     offset += fields[i].rowsize;
 
-    if (!gfits_varlength_column_define (srctable, &fields[i].zdef, i + 1)) ESCAPE(A);
-
-    if (!gfits_define_bintable_column (tgtheader, fields[i].tformat, fields[i].ttype, fields[i].ttype_cmt, fields[i].tunit, 1.0, 0.0)) ESCAPE (A);
+    if (!gfits_varlength_column_define (srctable, &fields[i].zdef, i + 1)) ESCAPE;
+
+    if (!gfits_define_bintable_column (tgtheader, fields[i].tformat, fields[i].ttype, fields[i].ttype_cmt, fields[i].tunit, 1.0, 0.0)) ESCAPE;
   }    
 
   // allocates the default data array (tgttable->buffer)
-  if (!gfits_create_table (tgtheader, tgttable)) ESCAPE (A);
+  if (!gfits_create_table (tgtheader, tgttable)) ESCAPE;
 
   // copy original header to output header (XXX this needs to be finished)
-  if (!gfits_copy_keywords_compress (srcheader, tgtheader)) ESCAPE (A);
+  if (!gfits_copy_keywords_compress (srcheader, tgtheader)) ESCAPE;
   
   off_t Nx, Ny;
-  if (!gfits_scan (srcheader, "ZNAXIS1", OFF_T_FMT, 1, &Nx)) ESCAPE (A);
-  if (!gfits_scan (srcheader, "ZNAXIS2", OFF_T_FMT, 1, &Ny)) ESCAPE (A);
+  if (!gfits_scan (srcheader, "ZNAXIS1", OFF_T_FMT, 1, &Nx)) ESCAPE;
+  if (!gfits_scan (srcheader, "ZNAXIS2", OFF_T_FMT, 1, &Ny)) ESCAPE;
   myAssert (Nx == tgtheader->Naxis[0], "table definition error?");
 
@@ -123 +124 @@
   ALLOCATE_ZERO (tmpbuffer, char, max_width*Ny);
   for (i = 0; i < Nfields; i++) {
-    if (!gfits_set_bintable_column (tgtheader, tgttable, fields[i].ttype, tmpbuffer, Ny)) ESCAPE (A);
+    if (!gfits_set_bintable_column (tgtheader, tgttable, fields[i].ttype, tmpbuffer, Ny)) ESCAPE;
   }
   free (tmpbuffer);
@@ -153 +154 @@
       off_t Nzdata;
       char *zdata = gfits_varlength_column_pointer (srctable, &fields[i].zdef, row, &Nzdata);
-      if (!zdata) ESCAPE(A);
+      if (!zdata) ESCAPE;
     
+      if (strcasecmp(fields[i].zctype, "GZIP_1") && strcasecmp(fields[i].zctype, "GZIP_2") && strcasecmp(fields[i].zctype, "RICE_1")) {
+        // Nzdata is number of bytes
+        if (!gfits_byteswap_zdata (zdata, Nzdata, fields[i].pixsize)) ESCAPE;
+      }
+
       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(A);
+      if (!gfits_uncompress_data (zdata, Nzdata, fields[i].zctype, NULL, NULL, 0, raw, &Nraw, fields[i].pixsize)) ESCAPE;
 
       if (!strcasecmp(fields[i].zctype, "GZIP_1")) {
         myAssert ((fields[i].zdef.format != 'C') && (fields[i].zdef.format != 'M'), "swap is probably wrong for C or M columns");
-        if (!gfits_byteswap_zdata (raw, Nraw * fields[i].pixsize, fields[i].pixsize)) ESCAPE(A);
+        if (!gfits_byteswap_zdata (raw, Nraw * fields[i].pixsize, fields[i].pixsize)) ESCAPE;
       }
 
@@ -171 +177 @@
 
       // copy the raw pixels from their native matrix locations to the temporary output buffer
-      if (!gfits_distribute_table_data (tgttable, raw, fields[i].offset, row_start, Nrows, fields[i].rowsize)) ESCAPE(A);
-      
-      // XXX need to activate
-      // if (FALSE) gfits_byteswap_zdata (zdata, Nzdata, zdata_pixsize) ESCAPE(A);
+      if (!strcasecmp(fields[i].zctype, "GZIP_2")) {
+        if (!gfits_distribute_table_gzp2 (tgttable, &fields[i], raw, row_start, Nrows)) ESCAPE;
+      } else {
+        if (!gfits_distribute_table_data (tgttable, &fields[i], raw, row_start, Nrows)) ESCAPE;
+      }      
     }
   }
@@ -194 +201 @@
 // raw_pixsize is the bytes / pixel for the input matrix
 // place the raw image bytes for the current tile into the tile buffer
-int gfits_distribute_table_data (FTable *table, char *raw, int col, int row_start, int Nrows, int rowsize) {
+int gfits_distribute_table_data (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
 
   off_t i;
@@ -202 +209 @@
   off_t Nx = table->header->Naxis[0];
 
-  if (VERBOSE) fprintf (stderr, "collect: ");
+  if (VERBOSE) fprintf (stderr, "distribute: ");
   for (i = 0; i < Nrows; i++) {
     int row = row_start + i;
-    memcpy (&table->buffer[Nx*row + col], &raw[i*rowsize], rowsize);
+    memcpy (&table->buffer[Nx*row + field->offset], &raw[i*field->rowsize], field->rowsize);
 # if (VERBOSE)
-    int j; for (j = 0; j < rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + col + j]);
+    int j; for (j = 0; j < field->rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + field->offset + j]);
 # endif
   }
@@ -214 +221 @@
   return (TRUE);
 }
+
+int gfits_distribute_table_gzp2 (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
+
+  off_t i, j, k;
+
+  // we are copying NN rows into the column which starts at XX and has MM bytes per row
+
+  off_t Nx = table->header->Naxis[0];
+
+  for (k = 0; k < field->pixsize; k++) {
+    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;
+      }
+    }
+  }
+  return (TRUE);
+}