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

Timestamp:

Jun 6, 2015, 8:40:19 PM (11 years ago)

Author:

eugene

Message:

trying to improve the speed of the compression shuffle step; added NONE_1 for testing; added timing traces in uncompress to test speed improvements

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

@@ -289 +289 @@
   off_t i;
 
+  // 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];
+
+  char *tblbuffer = &table->buffer[Nx*row_start + field->offset];
+
+  int rowsize = field->rowsize;
+
+  if (VERBOSE) fprintf (stderr, "distribute: ");
+  for (i = 0; i < Nrows; i++, tblbuffer += Nx) {
+    memcpy (&raw[i*rowsize], tblbuffer, rowsize);
+# if (VERBOSE)
+    int j; for (j = 0; j < field->rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + field->offset + j]);
+# endif
+  }
+  if (VERBOSE) fprintf (stderr, "\n");
+
+  return (TRUE);
+}
+
+int gfits_collect_table_data_alt (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
+
+  off_t i;
+
   // we are copying NN rows of the column which starts at XX and has MM bytes per row
 
@@ -307 +331 @@
 
 int gfits_collect_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];
+  int Nvalues = field->Nvalues;
+  int pixsize = field->pixsize;
+  int offset = field->offset;
+
+  char *rawptr = raw;
+
+  for (k = 0; k < field->pixsize; k++) {
+# ifdef BYTE_SWAP      
+    char *tblptr_start = &table->buffer[Nx*row_start + offset + (pixsize - k - 1)];
+# else
+    char *tblptr_start = &table->buffer[Nx*row_start + offset + k];
+# endif
+    for (i = 0; i < Nrows; i++, tblptr_start += Nx) {
+      char *tblptr = tblptr_start;
+      for (j = 0; j < Nvalues; j++, tblptr += pixsize, rawptr++) {
+        *rawptr = *tblptr;
+      }
+    }
+  }
+  return (TRUE);
+}
+
+int gfits_collect_table_gzp2_alt (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
 
   off_t i, j, k;