Index: trunk/Ohana/src/libdvo/include/dvodb.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvodb.h	(revision 38062)
+++ trunk/Ohana/src/libdvo/include/dvodb.h	(revision 38153)
@@ -89,4 +89,12 @@
   MAG_OPTION_F_STDEV_AP_R6, 
   MAG_OPTION_F_FILL_AP_R6, 
+
+  MAG_OPTION_F_AP_R7, 
+  MAG_OPTION_F_ERR_AP_R7, 
+  MAG_OPTION_F_STDEV_AP_R7, 
+  MAG_OPTION_F_FILL_AP_R7, 
+
+  MAG_OPTION_E1, 
+  MAG_OPTION_E2, 
 } dvoMagOptionType;
 
@@ -207,4 +215,5 @@
       MEAS_REF_COLOR_BLUE,
       MEAS_REF_COLOR_RED,
+
       MEAS_X11_SM_OBJ, 
       MEAS_X12_SM_OBJ, 
@@ -227,4 +236,20 @@
       MEAS_E1_SH_PSF, 
       MEAS_E2_SH_PSF, 
+
+      MEAS_F_AP_R5, 
+      MEAS_F_ERR_AP_R5, 
+      MEAS_F_STDEV_AP_R5, 
+      MEAS_F_FILL_AP_R5, 
+
+      MEAS_F_AP_R6, 
+      MEAS_F_ERR_AP_R6, 
+      MEAS_F_STDEV_AP_R6, 
+      MEAS_F_FILL_AP_R6, 
+
+      MEAS_F_AP_R7, 
+      MEAS_F_ERR_AP_R7, 
+      MEAS_F_STDEV_AP_R7, 
+      MEAS_F_FILL_AP_R7, 
+
       MEAS_E_BV,		      // extinction (mags)
       MEAS_E_BV_ERR,