Changeset 38340 for branches/eam_branches/ohana.20150429/src/libfits/test/imagecomp.c

Timestamp:

May 30, 2015, 7:59:48 PM (11 years ago)

Author:

eugene

Message:

more work on compression : cfitsio assumes gzip, not zlib (I have made uncompress general )

File:

• branches/eam_branches/ohana.20150429/src/libfits/test/imagecomp.c (modified) (7 diffs)

branches/eam_branches/ohana.20150429/src/libfits/test/imagecomp.c

@@ -3 +3 @@
 # include "tap_ohana.h"
 
-int test_compress (char *zcmptype);
+int test_compress (int bitpix, char *zcmptype);
 
 int main (int argc, char **argv) {
@@ -11 +11 @@
   diag ("libfits imagecomp.c tests");
 
-  test_compress ("NONE");
-  test_compress ("GZIP_1");
+  test_compress (  8, "NONE");
+  test_compress ( 16, "NONE");
+  test_compress ( 32, "NONE");
+  test_compress (-32, "NONE");
+  test_compress (-64, "NONE");
+
+  test_compress (  8, "GZIP_1");
+  test_compress ( 16, "GZIP_1");
+  test_compress ( 32, "GZIP_1");
+  test_compress (-32, "GZIP_1");
+  test_compress (-64, "GZIP_1");
 
   exit (0);
@@ -20 +29 @@
 # define NY 100
 
-int test_compress (char *zcmptype) { // make a table, compress, uncompress, compare : use compression zcmptype
+int test_compress (int bitpix, char *zcmptype) { // make a table, compress, uncompress, compare : use compression zcmptype
 
   Header rawheader;
@@ -31 +40 @@
   ftable.header = &theader;
 
-  diag ("--- starting test_compress with zcmptype %s ---", zcmptype);
+  diag ("--- starting test_compress with bitpix %d, zcmptype %s ---", bitpix, zcmptype);
   ok (gfits_init_header (&rawheader), "init'ed the raw header");
   ok (gfits_init_matrix (&rawmatrix), "init'ed the raw matrix");
@@ -38 +47 @@
 
   /* assign the necessary internal values */
-  rawheader.bitpix   = -32;
+  rawheader.bitpix   = bitpix;
   rawheader.Naxes = 2;
   rawheader.Naxis[0] = NX;
@@ -46 +55 @@
   ok (gfits_create_header (&rawheader),          "created header");
   ok (gfits_create_matrix (&rawheader, &rawmatrix), "created matrix");
-
-  float *rawdata = (float *) rawmatrix.buffer;
+  
+  char   *rawdata_char   = (char   *) rawmatrix.buffer;
+  short  *rawdata_short  = (short  *) rawmatrix.buffer;
+  int    *rawdata_int    = (int    *) rawmatrix.buffer;
+  float  *rawdata_float  = (float  *) rawmatrix.buffer;
+  double *rawdata_double = (double *) rawmatrix.buffer;
+  
   int ix, iy;
   for (ix = 0; ix < NX; ix++) {
     for (iy = 0; iy < NY; iy++) {
-      rawdata[ix + NX*iy] = ix * iy*iy;
+      switch (bitpix) {
+        case   8: rawdata_char  [ix + NX*iy] = ix + iy*iy; break;
+        case  16: rawdata_short [ix + NX*iy] = ix + iy*iy; break;
+        case  32: rawdata_int   [ix + NX*iy] = ix + iy*iy; break;
+        case -32: rawdata_float [ix + NX*iy] = ix + iy*iy; break;
+        case -64: rawdata_double[ix + NX*iy] = ix + iy*iy; break;
+        default: myAbort ("bad bitpix value");
+      }
     }
   }     
@@ -64 +85 @@
   int Nbad = 0;
 
-  float *outdata = (float *) outmatrix.buffer;
+  char   *outdata_char   = (char   *) outmatrix.buffer;
+  short  *outdata_short  = (short  *) outmatrix.buffer;
+  int    *outdata_int    = (int    *) outmatrix.buffer;
+  float  *outdata_float  = (float  *) outmatrix.buffer;
+  double *outdata_double = (double *) outmatrix.buffer;
+
   for (ix = 0; ix < NX; ix++) {
     for (iy = 0; iy < NY; iy++) {
-      if (rawdata[ix + NX*iy] != outdata[ix + NX*iy]) Nbad ++;
+      switch (bitpix) {
+        case   8: if (rawdata_char  [ix + NX*iy] != outdata_char  [ix + NX*iy]) Nbad ++; break;
+        case  16: if (rawdata_short [ix + NX*iy] != outdata_short [ix + NX*iy]) Nbad ++; break;
+        case  32: if (rawdata_int   [ix + NX*iy] != outdata_int   [ix + NX*iy]) Nbad ++; break;
+        case -32: if (rawdata_float [ix + NX*iy] != outdata_float [ix + NX*iy]) Nbad ++; break;
+        case -64: if (rawdata_double[ix + NX*iy] != outdata_double[ix + NX*iy]) Nbad ++; break;
+        default: myAbort ("bad bitpix value");
+      }
     }
   }