Index: trunk/Ohana/src/addstar/test/simple.dvo
===================================================================
--- trunk/Ohana/src/addstar/test/simple.dvo	(revision 33963)
+++ trunk/Ohana/src/addstar/test/simple.dvo	(revision 34260)
@@ -21,4 +21,10 @@
   test.fields PS1_V2 	PS1_V3
   test.fields PS1_V3 	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
 end  
 
@@ -83,4 +89,13 @@
     sort id1 v1
     sort id2 v2
+
+    # some fields require arithmetic manipulations
+    if ("$name:0" == "KRON_FLUX") 
+     set v1 = -2.5*log(v1)
+    end
+    if ("$name:0" == "KRON_FLUX_ERR") 
+     set v1 = KRON_FLUX_ERR / KRON_FLUX
+    end
+
     set d = v1 - v2
     vstat -q d
@@ -88,4 +103,12 @@
     #echo tapOK fabs($MEAN)  < 0.001 "$name:0 vs $name:2 (MEAN)"
     #echo tapOK fabs($SIGMA) < 0.001 "$name:0 vs $name:2 (SIGMA)"
+
+    # THETA is stored to only (360/65536) deg accuracy
+    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)"
+      continue
+    end
 
     tapOK {abs($MEAN)  < 0.001} "$name:0 vs $name:2 (MEAN)"
@@ -111,4 +134,7 @@
   output stdout
 end
+
+# the following lists define fields in the cmf files which can be compared to their equivalents in DVO
+# the left column is the cmf field name, the right column is the dvo field name
 
 # list of cmf fields to test matched to mextract fields
@@ -122,5 +148,5 @@
   PSF_INST_MAG      : mag:inst
   PSF_INST_MAG_SIG  : mag:err
-  PEAK_FLUX_AS_MAG  : SKIP
+  PEAK_FLUX_AS_MAG  : SKIP # not ingested into DVO
   SKY               : sky
   SKY_SIG           : sky_err
@@ -130,5 +156,5 @@
   PSF_THETA         : THETA
   PSF_QF            : PSF_QF
-  N_FRAMES          : SKIP
+  N_FRAMES          : SKIP # not ingested into DVO
 end
 
@@ -143,5 +169,5 @@
   PSF_INST_MAG      : mag:inst
   PSF_INST_MAG_SIG  : mag:err
-  PEAK_FLUX_AS_MAG  : SKIP
+  PEAK_FLUX_AS_MAG  : SKIP # not ingested into DVO
   SKY               : sky
   SKY_SIG           : sky_err
@@ -153,5 +179,5 @@
   PSF_THETA         : THETA
   PSF_QF            : PSF_QF
-  N_FRAMES          : SKIP
+  N_FRAMES          : SKIP # not ingested into DVO
   FLAGS             : phot_flags
 end
@@ -236,15 +262,18 @@
   X_PSF_SIG         : xccd:err # FAIL
   Y_PSF_SIG         : yccd:err # FAIL
-  RA_PSF            : SKIP # astrometry is not calibrated in the cmf
-  DEC_PSF           : SKIP # astrometry is not calibrated in the cmf
   POSANGLE          : SKIP # astrometry is not calibrated in the cmf
   PLTSCALE          : SKIP # astrometry is not calibrated in the cmf
   PSF_INST_MAG      : mag:inst	
   PSF_INST_MAG_SIG  : mag:err	
-  AP_MAG_STANDARD   : mag:ap # FAIL
-  AP_MAG_RADIUS     : SKIP # no accessor
-  PEAK_FLUX_AS_MAG  : SKIP # no accessor
+  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_RAW        : SKIP # not ingested into DVO
+  AP_MAG_RADIUS     : SKIP # not ingested into DVO
   CAL_PSF_MAG       : SKIP # photometry is not calibrated in the cmf
   CAL_PSF_MAG_SIG   : SKIP # photometry is not calibrated in the cmf
+  RA_PSF            : SKIP # astrometry is not calibrated in the cmf
+  DEC_PSF           : SKIP # astrometry is not calibrated in the cmf
+  PEAK_FLUX_AS_MAG  : SKIP # not ingested into DVO
   SKY               : sky	
   SKY_SIG           : sky_err	
@@ -256,10 +285,21 @@
   PSF_THETA         : THETA # FAIL
   PSF_QF            : PSF_QF	
-  PSF_NDOF          : SKIP # no accessor
-  PSF_NPIX          : SKIP # no accessor
-  MOMENTS_XX        : SKIP # no accessor
-  MOMENTS_XY        : SKIP # no accessor
-  MOMENTS_YY        : SKIP # no accessor
+  PSF_QF_PERFECT    : SKIP # not ingested into DVO
+  PSF_NDOF          : PSF_NDOF
+  PSF_NPIX          : PSF_NPIX
+  MOMENTS_XX        : MXX
+  MOMENTS_XY        : MXY
+  MOMENTS_YY        : MYY
+  MOMENTS_M3C       : SKIP # not ingested into DVO
+  MOMENTS_M3S       : SKIP # not ingested into DVO
+  MOMENTS_M4C       : SKIP # not ingested into DVO
+  MOMENTS_M4S       : SKIP # not ingested into DVO
+  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_INNER   : SKIP # not ingested into DVO
+  KRON_FLUX_OUTER   : SKIP # not ingested into DVO
   FLAGS             : phot_flags
-  N_FRAMES          : SKIP # no accessor	
-end
+  N_FRAMES          : SKIP # not ingested into DVO
+end