Changeset 38356 for branches/eam_branches/ohana.20150429/src/libfits/test

Timestamp:

Jun 3, 2015, 7:00:55 AM (11 years ago)

Author:

eugene

Message:

get the input / output / compressed pixels sizes right and get the byteswaps right

Location:

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

Files:

• compress.sh (modified) (2 diffs)
• imagecomp.c (modified) (4 diffs)
• ricetest.c (added)

branches/eam_branches/ohana.20150429/src/libfits/test/compress.sh

@@ -2 +2 @@
 macro test_image_all 
 
-  foreach mode NONE GZIP_1
+  foreach mode NONE GZIP_1 RICE_1
     foreach bitpix 8 16 32 -32 -64
       echo ===== bitpix = $bitpix =====
@@ -40 +40 @@
  end
 
+ if ($cmpmode == RICE_1) 
+   echo "*** funpack fails on RICE_1 ****"
+   return
+ end
+
  if ($bitpix == -64)
    echo "*** bitpix $bitpix fails fpack / funpack ***"
  else
+   echo "run funpack on our version"
    exec funpack -S test.cmp.fits > test.fun.fits
    rd e test.fun.fits

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

@@ -4 +4 @@
 
 int test_compress (int bitpix, char *zcmptype);
+
+// char *cmptype[] = {"NONE", "GZIP_1", "GZIP_2", "PLIO_1", "RICE_1", "RICE_ONE", "HCOMPRESS_1", NULL};
+char *cmptype[] = {"NONE", "GZIP_1", "RICE_1", "RICE_ONE", NULL};
+int bitpix[] = {8, 16, 32, -32, -64, 0};
+
+// char *cmptype[] = {"NONE", "GZIP_1", NULL};
+// char *cmptype[] = {"PLIO_1", NULL};
+// int bitpix[] = {8, 16, 32, 0};
+
+// char *cmptype[] = {"RICE_1", NULL};
+// int bitpix[] = {-32, -64, 0};
 
 int main (int argc, char **argv) {
@@ -11 +22 @@
   diag ("libfits imagecomp.c tests");
 
-  test_compress (  8, "NONE");
-  test_compress ( 16, "NONE");
-  test_compress ( 32, "NONE");
-  test_compress (-32, "NONE");
-  test_compress (-64, "NONE");
+  int i, j;
+  for (i = 0; cmptype[i]; i++) {
+    for (j = 0; bitpix[j]; j++) {
+      test_compress (bitpix[j], cmptype[i]);
+    }
+  }
 
-  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");
+  // 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);
@@ -27 +44 @@
 
 # define NX 100
-# define NY 100
+# define NY 10
 
 int test_compress (int bitpix, char *zcmptype) { // make a table, compress, uncompress, compare : use compression zcmptype
@@ -65 +82 @@
   for (ix = 0; ix < NX; ix++) {
     for (iy = 0; iy < NY; iy++) {
+      int IY = iy + 1;
       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;
+        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");
       }