Changeset 41474 for trunk/Ohana/src/libfits/test

Timestamp:

Jan 24, 2021, 3:37:52 PM (5 years ago)

Author:

eugene

Message:

clarify in comments the buffers and pixel sizes used in the different stages of compression/uncompression; catch unimplemented compression cases; fix error in pixel size for RICE1; cleanup verbose code; use correct sscanf format code in ASCII table reading code

Location:

trunk/Ohana/src/libfits/test

Files:

• compress.sh (modified) (8 diffs)
• imagecomp.c (modified) (5 diffs)

trunk/Ohana/src/libfits/test/compress.sh

@@ -1 +1 @@
 input tap.dvo
+
+## NOTE: in order to run this test suite, you must have a modern version of fpack / funpack.
+## The IPP version included in the build tree (3100-p5) does not have support for gzip2 in fpack.
+
+## Acceptable versions can be obtained by downloading a current copy
+## of CFITSIO (https://heasarc.gsfc.nasa.gov/fitsio/).
+
+## To avoid installing the library or funpack/fpack in your psconfig
+## tree, only build the code locally and do NOT install.  
+
+## in the cfitsio directory, edit the Makefile with the following changes:
+
+## LDFLAGS_BIN =        -g -O2 -Wl,-rpath,${CFITSIO_LIB} -static
+## CFLAGS =     -g -Dg77Fortran -fPIC
+## (comment out the old versions)
+
+## run psconfigure, make, make fpack funpack
+
+## after building these (static) binaries, link them into this test directory
 
 macro tests
@@ -5 +24 @@
   test_table_all_rnd
 end
+
+$FPACK = ./fpack
+$FUNPACK = ./funpack
 
 macro test_image_all 
@@ -53 +75 @@
 
  if ($cmpmode == GZIP_1)
-   exec fpack -q 0 -g -S test.raw.fits > test.fpk.fits
+   ## mana does not (yet) handle non-zero quantization 
+   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
+   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
+   exec $FPACK -r -S test.raw.fits > test.fpk.fits
  end
  # echo "load fpack version"
@@ -68 +91 @@
  tapOK {$SIGMA      < 0.001} "read fpack $cmpmode $bitpix (SIGMA = $SIGMA)"
 
- if ($cmpmode == RICE_1_0) 
-   echo "*** funpack fails on RICE_1 ****"
-   return
- end
+ # if ($cmpmode == RICE_1_0) 
+ #   echo "*** funpack fails on RICE_1 ****"
+ #   return
+ # end
 
  # echo "run funpack on our version"
- exec funpack -S test.cmp.fits > test.fun.fits
+ exec $FUNPACK -S test.cmp.fits > test.fun.fits
  rd e test.fun.fits
  set d = x - e
@@ -213 +236 @@
  if (1)
    tapEXEC /bin/cp -f test.raw.tbl test.fpk.tbl
-   tapEXEC fpack -table -F test.fpk.tbl
+   tapEXEC $FPACK -table -F test.fpk.tbl
    
    data test.fpk.tbl
@@ -236 +259 @@
  # try to run fpack on ours
  tapEXEC /bin/cp -f test.cmp.tbl test.fun.tbl
- tapEXEC funpack -F test.fun.tbl
+ tapEXEC $FUNPACK -F test.fun.tbl
 
  data test.fun.tbl
@@ -403 +426 @@
  if (1)
    tapEXEC /bin/cp -f test.raw.tbl test.fpk.tbl
-   tapEXEC fpack -table -F test.fpk.tbl
+   tapEXEC $FPACK -table -F test.fpk.tbl
    
    data test.fpk.tbl
@@ -431 +454 @@
  # try to run fpack on ours
  tapEXEC /bin/cp -f test.cmp.tbl test.fun.tbl
- tapEXEC funpack -F test.fun.tbl
+ tapEXEC $FUNPACK -F test.fun.tbl
 
  data test.fun.tbl

trunk/Ohana/src/libfits/test/imagecomp.c

@@ -3 +3 @@
 # include "tap_ohana.h"
 
+# define MEM_VERBOSE FALSE
+
 int test_compress (int bitpix, char *zcmptype);
 int test_compress_fullrange (int bitpix, char *zcmptype);
 int test_compress_fulltile (int bitpix, char *zcmptype);
 
-// char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "PLIO_1", "RICE_1", "RICE_ONE", "HCOMPRESS_1", NULL};
+// XXX FULL SET : char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "PLIO_1", "RICE_1", "RICE_ONE", "HCOMPRESS_1", NULL};
 char *cmptype[] = {"NONE", "NONE_1", "NONE_2", "GZIP_1", "GZIP_2", "RICE_1", "RICE_ONE", NULL};
+// XXX NOT WORKING: char *cmptype[] = {"HCOMPRESS_1", NULL};
 int bitpix[] = {8, 16, 32, -32, -64, 0};
 
@@ -31 +34 @@
       test_compress_fulltile (bitpix[j], cmptype[i]);
       test_compress_fullrange (bitpix[j], cmptype[i]);
-      ok (ohana_memcheck (TRUE), "no memory corruption");
+      ok (ohana_memcheck (MEM_VERBOSE), "no memory corruption");
     }
   }
@@ -43 +46 @@
       test_compress_fulltile (bitpix[j], cmptype[i]);
       test_compress_fullrange (bitpix[j], cmptype[i]);
-      ok (ohana_memcheck (TRUE), "no memory corruption");
+      ok (ohana_memcheck (MEM_VERBOSE), "no memory corruption");
     }
   }
@@ -55 +58 @@
       test_compress_fulltile (bitpix[j], cmptype[i]);
       test_compress_fullrange (bitpix[j], cmptype[i]);
-      ok (ohana_memcheck (TRUE), "no memory corruption");
+      ok (ohana_memcheck (MEM_VERBOSE), "no memory corruption");
     }
   }
@@ -138 +141 @@
   }     
   
+  // diag ("--- Image has a total of %d pixels of which %d are bad ---", NX*NY, Nbad);
   ok (!Nbad, "all image pixels match");