Index: /branches/eam_branches/ohana.20150429/src/addstar/test/compress.dvo
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/test/compress.dvo	(revision 38400)
+++ /branches/eam_branches/ohana.20150429/src/addstar/test/compress.dvo	(revision 38401)
@@ -6,31 +6,13 @@
 macro test.all
   # test.fields (DVO schema) (CMF format)
-  test.fields PS1_DEV_0 PS1_V1
-  test.fields PS1_DEV_1 PS1_V1
-  test.fields PS1_V1    PS1_V1
-  test.fields PS1_V2    PS1_V1
-  test.fields PS1_V3    PS1_V1
-  test.fields PS1_V5    PS1_V1
-
-  test.fields PS1_DEV_0 PS1_V2
-  test.fields PS1_DEV_1 PS1_V2
-  test.fields PS1_V1    PS1_V2
-  test.fields PS1_V2    PS1_V2
-  test.fields PS1_V3    PS1_V2
-  test.fields PS1_V5    PS1_V2
-
-  test.fields PS1_DEV_0 PS1_V3
-  test.fields PS1_DEV_1 PS1_V3
-  test.fields PS1_V1    PS1_V3
-  test.fields PS1_V2    PS1_V3
-  test.fields PS1_V3    PS1_V3
-  test.fields PS1_V5    PS1_V3
-
-  test.fields PS1_DEV_0 PS1_V4
-  test.fields PS1_DEV_1 PS1_V4
-  test.fields PS1_V1    PS1_V4
-  test.fields PS1_V2    PS1_V4
-  test.fields PS1_V3    PS1_V4
-  test.fields PS1_V5    PS1_V4
+  local dvo_schema cmf_format cmpmode
+
+  foreach cmf_format PS1_DEV_0 PS1_DEV_1 PS1_V1 PS1_V2 PS1_V3 PS1_V5
+    foreach dvo_schema PS1_V1 PS1_V2 PS1_V3 PS1_V4
+      foreach cmpmode NONE GZIP_1 GZIP_2 RICE_1 AUTO
+        test.fields $cmf_format $dvo_schema $cmpmode
+      end
+    end
+  end
 end  
 
@@ -41,6 +23,6 @@
 # create a populated catdir with a single cmf -- test each field
 macro test.fields
-  if ($0 != 3)
-    echo "USAGE: test.fields (cmftype) (dvotype?)"
+  if ($0 != 4)
+    echo "USAGE: test.fields (cmf_format) (dvo_schema) (cmdmode)"
     break
   end
@@ -56,5 +38,5 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
-  tapEXEC addstar -D CATCOMPRESS GZIP_2 -D CATDIR $CATDIR -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
+  tapEXEC addstar -D CATCOMPRESS $3 -D CATDIR $CATDIR -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
 
   list testfields -copy testfields_$1