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

Timestamp:

Jun 3, 2015, 8:20:19 PM (11 years ago)

Author:

eugene

Message:

adding GZIP_2 and getting RICE_1 to work (mostly)

Location:

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

Files:

• compress.sh (modified) (2 diffs)
• imagecomp.c (modified) (3 diffs)

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

@@ -2 +2 @@
 macro test_image_all 
 
-  foreach mode NONE GZIP_1 RICE_1
+  # foreach mode NONE GZIP_1 RICE_1
+  # foreach mode GZIP_1
+  foreach mode GZIP_2
+  # foreach mode RICE_1
     foreach bitpix 8 16 32 -32 -64
+    # foreach bitpix 32
       echo ===== bitpix = $bitpix =====
       test_image_single $bitpix $mode
@@ -30 +34 @@
  if ($cmpmode == NONE) return
 
- if ($bitpix == -64)
-   echo "*** bitpix $bitpix fails fpack / funpack ***"
- else
-   exec fpack -g -S test.raw.fits > test.fpk.fits
-   echo "load fpack version"
-   rd c test.fpk.fits -x 0
-   set d = x - c
-   stat d
- end
-
- if ($cmpmode == RICE_1) 
+ if ($cmpmode == GZIP_1)
+   exec fpack -q 0 -g -S test.raw.fits > test.fpk.fits
+ end
+ if ($cmpmode == GZIP_2)
+   exec fpack -q 0 -g2 -S test.raw.fits > test.fpk.fits
+ end
+ if ($cmpmode == RICE_1)
+   exec fpack -r -S test.raw.fits > test.fpk.fits
+ end
+ echo "load fpack version"
+ rd c test.fpk.fits -x 0
+ set d = x - c
+ stat d
+
+ if ($cmpmode == RICE_1_0) 
    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
-   set d = x - e
-   stat d
- end
+ echo "run funpack on our version"
+ exec funpack -S test.cmp.fits > test.fun.fits
+ rd e test.fun.fits
+ set d = x - e
+ stat d
 end
 

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

@@ -6 +6 @@
 
 // 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", "RICE_1", "RICE_ONE", NULL};
+// int bitpix[] = {8, 16, 32, -32, -64, 0};
 
 // char *cmptype[] = {"NONE", "GZIP_1", NULL};
@@ -13 +13 @@
 // int bitpix[] = {8, 16, 32, 0};
 
-// char *cmptype[] = {"RICE_1", NULL};
-// int bitpix[] = {-32, -64, 0};
+char *cmptype[] = {"GZIP_2", NULL};
+int bitpix[] = {-32, 0};
 
 int main (int argc, char **argv) {
@@ -43 +43 @@
 }
 
-# define NX 100
+# define NX 10
 # define NY 10