Index: trunk/Ohana/src/addstar/test/simple.dvo
===================================================================
--- trunk/Ohana/src/addstar/test/simple.dvo	(revision 37036)
+++ trunk/Ohana/src/addstar/test/simple.dvo	(revision 38441)
@@ -10,5 +10,5 @@
   test.fields PS1_V2    PS1_V1
   test.fields PS1_V3    PS1_V1
-  test.fields PS1_V4    PS1_V1
+  test.fields PS1_V5    PS1_V1
 
   test.fields PS1_DEV_0 PS1_V2
@@ -17,5 +17,5 @@
   test.fields PS1_V2    PS1_V2
   test.fields PS1_V3    PS1_V2
-  test.fields PS1_V4    PS1_V4
+  test.fields PS1_V5    PS1_V2
 
   test.fields PS1_DEV_0 PS1_V3
@@ -24,5 +24,5 @@
   test.fields PS1_V2    PS1_V3
   test.fields PS1_V3    PS1_V3
-  test.fields PS1_V4    PS1_V4
+  test.fields PS1_V5    PS1_V3
 
   test.fields PS1_DEV_0 PS1_V4
@@ -31,5 +31,5 @@
   test.fields PS1_V2    PS1_V4
   test.fields PS1_V3    PS1_V4
-  test.fields PS1_V4    PS1_V4
+  test.fields PS1_V5    PS1_V4
 end  
 
@@ -54,13 +54,6 @@
 
   mkinput
-  echo mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
-  exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
-  if ($TAP_VERBOSE)
-    echo exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
-    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
-  else
-    echo addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
-    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass >& tmp.log
-  end
+  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 CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
 
   list testfields -copy testfields_$1
@@ -79,4 +72,5 @@
     if ("$name:0" == "SKIP") continue
     if ("$name:2" == "SKIP") continue
+ 
     read -fits Chip.psf $name:0
     mextract $name:2
@@ -92,6 +86,6 @@
   set d = $name:0 - $name:2
   vstat -q d
-  tapOK {abs($MEAN)  < 0.001} "$name:0 vs $name:2 (MEAN)"
-  tapOK {abs($SIGMA) < 0.001} "$name:0 vs $name:2 (SIGMA)"
+  tapOK {abs($MEAN)  < 0.001} "$name:0 vs $name:2 (MEAN = $MEAN)"
+  tapOK {abs($SIGMA) < 0.001} "$name:0 vs $name:2 (SIGMA = $SIGMA)"
 
   # detection ID must be first for this to work:
@@ -142,11 +136,11 @@
     if ("$name:0" == "PSF_THETA")
       # echo $MEAN
-      tapOK {abs($MEAN)  < 0.006} "$name:0 vs $name:2 (MEAN)"
-      tapOK {abs($SIGMA) < 0.001} "$name:0 vs $name:2 (SIGMA)"
+      tapOK {abs($MEAN)  < 0.006} "$name:0 vs $name:2 (MEAN = $MEAN)"
+      tapOK {abs($SIGMA) < 0.001} "$name:0 vs $name:2 (SIGMA = $SIGMA)"
       continue
     end
 
-    tapOK {abs($MEAN)  < 0.001} "$name:0 vs $name:2 (MEAN)"
-    tapOK {abs($SIGMA) < 0.001} "$name:0 vs $name:2 (SIGMA)"
+    tapOK {abs($MEAN)  < 0.001} "$name:0 vs $name:2 (MEAN = $MEAN)"
+    tapOK {abs($SIGMA) < 0.001} "$name:0 vs $name:2 (SIGMA = $MEAN)"
   end    
 
@@ -231,5 +225,5 @@
   PSF_INST_MAG      : mag:inst  
   PSF_INST_MAG_SIG  : mag:err   
-  AP_MAG_STANDARD   : mag:ap # FAIL
+# AP_MAG_STANDARD   : mag:ap # FAIL
   AP_MAG_RADIUS     : SKIP # no accessor
   PEAK_FLUX_AS_MAG  : SKIP # no accessor
@@ -237,5 +231,5 @@
   CAL_PSF_MAG_SIG   : SKIP # photometry is not calibrated in the cmf
   SKY               : sky       
-  SKY_SIG           : sky_err   
+  SKY_SIGMA         : sky_err   
   PSF_CHISQ         : psf_chisq 
   CR_NSIGMA         : cr_nsigma 
@@ -267,5 +261,5 @@
   PSF_INST_MAG      : mag:inst  
   PSF_INST_MAG_SIG  : mag:err   
-  AP_MAG_STANDARD   : mag:ap # FAIL
+# AP_MAG_STANDARD   : mag:ap # FAIL
   AP_MAG_RADIUS     : SKIP # no accessor
   PEAK_FLUX_AS_MAG  : SKIP # no accessor
@@ -273,5 +267,5 @@
   CAL_PSF_MAG_SIG   : SKIP # photometry is not calibrated in the cmf
   SKY               : sky       
-  SKY_SIG           : sky_err   
+  SKY_SIGMA         : sky_err   
   PSF_CHISQ         : psf_chisq 
   CR_NSIGMA         : cr_nsigma 
@@ -303,5 +297,5 @@
   PSF_INST_FLUX     : SKIP # not ingested into DVO
   PSF_INST_FLUX_SIG : SKIP # not ingested into DVO
-  AP_MAG_STANDARD   : mag:aperinst # FAIL
+# AP_MAG_STANDARD   : mag:aperinst # FAIL
   AP_MAG_RAW        : SKIP # not ingested into DVO
   AP_MAG_RADIUS     : SKIP # not ingested into DVO
@@ -312,5 +306,5 @@
   PEAK_FLUX_AS_MAG  : SKIP # not ingested into DVO
   SKY               : sky       
-  SKY_SIG           : sky_err   
+  SKY_SIGMA         : sky_err   
   PSF_CHISQ         : psf_chisq 
   CR_NSIGMA         : cr_nsigma 
@@ -332,6 +326,6 @@
   MOMENTS_R1        : SKIP # not ingested into DVO
   MOMENTS_RH        : SKIP # not ingested into DVO
-  KRON_FLUX         : mag:kroninst
-  KRON_FLUX_ERR     : mag:kronerr
+  KRON_FLUX         : mag:kron:inst
+  KRON_FLUX_ERR     : mag:kron:err
   KRON_FLUX_INNER   : SKIP # not ingested into DVO
   KRON_FLUX_OUTER   : SKIP # not ingested into DVO