Index: /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/include/dvo.h
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/include/dvo.h	(revision 38146)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/include/dvo.h	(revision 38147)
@@ -1150,4 +1150,22 @@
 LENSFIELD(E2_sh_psf)
 
+LENSFIELD( F_ApR5);
+LENSFIELD(dF_ApR5);
+LENSFIELD(sF_ApR5);
+LENSFIELD(fF_ApR5);
+
+LENSFIELD( F_ApR6);
+LENSFIELD(dF_ApR6);
+LENSFIELD(sF_ApR6);
+LENSFIELD(fF_ApR6);
+
+LENSFIELD( F_ApR7);
+LENSFIELD(dF_ApR7);
+LENSFIELD(sF_ApR7);
+LENSFIELD(fF_ApR7);
+
+LENSFIELD(E1);
+LENSFIELD(E2);
+
 # undef LENSFIELD
 
Index: /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/include/dvodb.h
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/include/dvodb.h	(revision 38146)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/include/dvodb.h	(revision 38147)
@@ -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,
Index: /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbExtractAverages.c
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbExtractAverages.c	(revision 38146)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbExtractAverages.c	(revision 38147)
@@ -386,4 +386,22 @@
 	case MAG_OPTION_E1_SH_PSF:  { value.Flt = LensValue_E1_sh_psf  (field->photcode, lensobj); break; }
 	case MAG_OPTION_E2_SH_PSF:  { value.Flt = LensValue_E2_sh_psf  (field->photcode, lensobj); break; }
+
+	case MAG_OPTION_F_AP_R5:       { value.Flt = LensValue_F_ApR5  (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_ERR_AP_R5:   { value.Flt = LensValue_dF_ApR5 (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_STDEV_AP_R5: { value.Flt = LensValue_sF_ApR5 (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_FILL_AP_R5:  { value.Flt = LensValue_fF_ApR5 (field->photcode, lensobj); break; }
+
+	case MAG_OPTION_F_AP_R6:       { value.Flt = LensValue_F_ApR6  (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_ERR_AP_R6:   { value.Flt = LensValue_dF_ApR6 (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_STDEV_AP_R6: { value.Flt = LensValue_sF_ApR6 (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_FILL_AP_R6:  { value.Flt = LensValue_fF_ApR6 (field->photcode, lensobj); break; }
+
+	case MAG_OPTION_F_AP_R7:       { value.Flt = LensValue_F_ApR7  (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_ERR_AP_R7:   { value.Flt = LensValue_dF_ApR7 (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_STDEV_AP_R7: { value.Flt = LensValue_sF_ApR7 (field->photcode, lensobj); break; }
+	case MAG_OPTION_F_FILL_AP_R7:  { value.Flt = LensValue_fF_ApR7 (field->photcode, lensobj); break; }
+
+	case MAG_OPTION_E1:  	       { value.Flt = LensValue_E1      (field->photcode, lensobj); break; }
+	case MAG_OPTION_E2:  	       { value.Flt = LensValue_E2      (field->photcode, lensobj); break; }
 
 	case MAG_OPTION_NONE:
Index: /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbExtractMeasures.c
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 38146)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 38147)
@@ -277,4 +277,10 @@
 	case MAG_OPTION_F_STDEV_AP_R6: 
 	case MAG_OPTION_F_FILL_AP_R6: 
+	case MAG_OPTION_F_AP_R7: 
+	case MAG_OPTION_F_ERR_AP_R7: 
+	case MAG_OPTION_F_STDEV_AP_R7: 
+	case MAG_OPTION_F_FILL_AP_R7: 
+	case MAG_OPTION_E1: 
+	case MAG_OPTION_E2: 
 
 	case MAG_OPTION_NONE:
@@ -735,4 +741,38 @@
       }
       break;
+
+    case MEAS_X11_SM_OBJ: { value.Flt = lensing->X11_sm_obj; break; } 
+    case MEAS_X12_SM_OBJ: { value.Flt = lensing->X12_sm_obj; break; } 
+    case MEAS_X22_SM_OBJ: { value.Flt = lensing->X22_sm_obj; break; } 
+    case MEAS_E1_SM_OBJ:  { value.Flt = lensing->E1_sm_obj; break; } 
+    case MEAS_E2_SM_OBJ:  { value.Flt = lensing->E2_sm_obj; break; } 
+    case MEAS_X11_SH_OBJ: { value.Flt = lensing->X11_sh_obj; break; } 
+    case MEAS_X12_SH_OBJ: { value.Flt = lensing->X12_sh_obj; break; } 
+    case MEAS_X22_SH_OBJ: { value.Flt = lensing->X22_sh_obj; break; } 
+    case MEAS_E1_SH_OBJ:  { value.Flt = lensing->E1_sh_obj; break; } 
+    case MEAS_E2_SH_OBJ:  { value.Flt = lensing->E2_sh_obj; break; } 
+    case MEAS_X11_SM_PSF: { value.Flt = lensing->X11_sm_psf; break; } 
+    case MEAS_X12_SM_PSF: { value.Flt = lensing->X12_sm_psf; break; } 
+    case MEAS_X22_SM_PSF: { value.Flt = lensing->X22_sm_psf; break; } 
+    case MEAS_E1_SM_PSF:  { value.Flt = lensing->E1_sm_psf; break; } 
+    case MEAS_E2_SM_PSF:  { value.Flt = lensing->E2_sm_psf; break; } 
+    case MEAS_X11_SH_PSF: { value.Flt = lensing->X11_sh_psf; break; } 
+    case MEAS_X12_SH_PSF: { value.Flt = lensing->X12_sh_psf; break; } 
+    case MEAS_X22_SH_PSF: { value.Flt = lensing->X22_sh_psf; break; } 
+    case MEAS_E1_SH_PSF:  { value.Flt = lensing->E1_sh_psf; break; } 
+    case MEAS_E2_SH_PSF:  { value.Flt = lensing->E2_sh_psf; break; } 
+
+    case MEAS_F_AP_R5:       { value.Flt = lensing-> F_ApR5; break; } 
+    case MEAS_F_ERR_AP_R5:   { value.Flt = lensing->dF_ApR5; break; } 
+    case MEAS_F_STDEV_AP_R5: { value.Flt = lensing->sF_ApR5; break; } 
+    case MEAS_F_FILL_AP_R5:  { value.Flt = lensing->fF_ApR5; break; } 
+    case MEAS_F_AP_R6:       { value.Flt = lensing-> F_ApR6; break; } 
+    case MEAS_F_ERR_AP_R6:   { value.Flt = lensing->dF_ApR6; break; } 
+    case MEAS_F_STDEV_AP_R6: { value.Flt = lensing->sF_ApR6; break; } 
+    case MEAS_F_FILL_AP_R6:  { value.Flt = lensing->fF_ApR6; break; } 
+    case MEAS_F_AP_R7:       { value.Flt = lensing-> F_ApR7; break; } 
+    case MEAS_F_ERR_AP_R7:   { value.Flt = lensing->dF_ApR7; break; } 
+    case MEAS_F_STDEV_AP_R7: { value.Flt = lensing->sF_ApR7; break; } 
+    case MEAS_F_FILL_AP_R7:  { value.Flt = lensing->fF_ApR7; break; } 
 
     case MEAS_E_BV:             { value.Flt = starpar->Ebv;      break; }
Index: /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbFields.c
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbFields.c	(revision 38146)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dbFields.c	(revision 38147)
@@ -61,4 +61,19 @@
     if (fields[i].ID == MEAS_E1_SH_PSF)  return TRUE;
     if (fields[i].ID == MEAS_E2_SH_PSF)  return TRUE;
+
+    if (fields[i].ID == MEAS_F_AP_R5)       return TRUE;
+    if (fields[i].ID == MEAS_F_ERR_AP_R5)   return TRUE;
+    if (fields[i].ID == MEAS_F_STDEV_AP_R5) return TRUE;
+    if (fields[i].ID == MEAS_F_FILL_AP_R5)  return TRUE;
+
+    if (fields[i].ID == MEAS_F_AP_R6)       return TRUE;
+    if (fields[i].ID == MEAS_F_ERR_AP_R6)   return TRUE;
+    if (fields[i].ID == MEAS_F_STDEV_AP_R6) return TRUE;
+    if (fields[i].ID == MEAS_F_FILL_AP_R6)  return TRUE;
+
+    if (fields[i].ID == MEAS_F_AP_R7)       return TRUE;
+    if (fields[i].ID == MEAS_F_ERR_AP_R7)   return TRUE;
+    if (fields[i].ID == MEAS_F_STDEV_AP_R7) return TRUE;
+    if (fields[i].ID == MEAS_F_FILL_AP_R7)  return TRUE;
   }
   return FALSE;
@@ -90,4 +105,22 @@
     if (fields[i].magOption == MAG_OPTION_E1_SH_PSF)  return TRUE;
     if (fields[i].magOption == MAG_OPTION_E2_SH_PSF)  return TRUE;
+
+    if (fields[i].magOption == MAG_OPTION_F_AP_R5)       return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_ERR_AP_R5)   return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_STDEV_AP_R5) return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_FILL_AP_R5)  return TRUE;
+
+    if (fields[i].magOption == MAG_OPTION_F_AP_R6)       return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_ERR_AP_R6)   return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_STDEV_AP_R6) return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_FILL_AP_R6)  return TRUE;
+
+    if (fields[i].magOption == MAG_OPTION_F_AP_R7)       return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_ERR_AP_R7)   return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_STDEV_AP_R7) return TRUE;
+    if (fields[i].magOption == MAG_OPTION_F_FILL_AP_R7)  return TRUE;
+
+    if (fields[i].magOption == MAG_OPTION_E1)            return TRUE;
+    if (fields[i].magOption == MAG_OPTION_E2)            return TRUE;
   }
   return FALSE;
@@ -199,12 +232,18 @@
   if (!strcasecmp (string, "E1_SH_PSF"))     return MAG_OPTION_E1_SH_PSF; 
   if (!strcasecmp (string, "E2_SH_PSF"))     return MAG_OPTION_E2_SH_PSF; 
-  // if (!strcasecmp (string, "F_AP_R5"))       return MAG_OPTION_F_AP_R5; 
-  // if (!strcasecmp (string, "F_ERR_AP_R5"))   return MAG_OPTION_F_ERR_AP_R5; 
-  // if (!strcasecmp (string, "F_STDEV_AP_R5")) return MAG_OPTION_F_STDEV_AP_R5; 
-  // if (!strcasecmp (string, "F_FILL_AP_R5"))  return MAG_OPTION_F_FILL_AP_R5; 
-  // if (!strcasecmp (string, "F_AP_R6"))       return MAG_OPTION_F_AP_R6; 
-  // if (!strcasecmp (string, "F_ERR_AP_R6"))   return MAG_OPTION_F_ERR_AP_R6; 
-  // if (!strcasecmp (string, "F_STDEV_AP_R6")) return MAG_OPTION_F_STDEV_AP_R6; 
-  // if (!strcasecmp (string, "F_FILL_AP_R6"))  return MAG_OPTION_F_FILL_AP_R6; 
+  if (!strcasecmp (string, "F_AP_R5"))       return MAG_OPTION_F_AP_R5; 
+  if (!strcasecmp (string, "F_ERR_AP_R5"))   return MAG_OPTION_F_ERR_AP_R5; 
+  if (!strcasecmp (string, "F_STDEV_AP_R5")) return MAG_OPTION_F_STDEV_AP_R5; 
+  if (!strcasecmp (string, "F_FILL_AP_R5"))  return MAG_OPTION_F_FILL_AP_R5; 
+  if (!strcasecmp (string, "F_AP_R6"))       return MAG_OPTION_F_AP_R6; 
+  if (!strcasecmp (string, "F_ERR_AP_R6"))   return MAG_OPTION_F_ERR_AP_R6; 
+  if (!strcasecmp (string, "F_STDEV_AP_R6")) return MAG_OPTION_F_STDEV_AP_R6; 
+  if (!strcasecmp (string, "F_FILL_AP_R6"))  return MAG_OPTION_F_FILL_AP_R6; 
+  if (!strcasecmp (string, "F_AP_R7"))       return MAG_OPTION_F_AP_R7; 
+  if (!strcasecmp (string, "F_ERR_AP_R7"))   return MAG_OPTION_F_ERR_AP_R7; 
+  if (!strcasecmp (string, "F_STDEV_AP_R7")) return MAG_OPTION_F_STDEV_AP_R7; 
+  if (!strcasecmp (string, "F_FILL_AP_R7"))  return MAG_OPTION_F_FILL_AP_R7; 
+  if (!strcasecmp (string, "E1"))            return MAG_OPTION_E1; 
+  if (!strcasecmp (string, "E2"))            return MAG_OPTION_E2; 
 
   return MAG_OPTION_NONE;
@@ -534,4 +573,17 @@
   if (!strcasecmp (fieldName, "E2_SH_PSF"))      ESCAPE (MEAS_E2_SH_PSF,  OPIHI_FLT);
 
+  if (!strcasecmp (fieldName, "F_AP_R5"))        ESCAPE (MEAS_F_AP_R5,       OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_ERR_AP_R5"))    ESCAPE (MEAS_F_ERR_AP_R5,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_STDEV_AP_R5"))  ESCAPE (MEAS_F_STDEV_AP_R5, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_FILL_AP_R5"))   ESCAPE (MEAS_F_FILL_AP_R5,  OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_AP_R6"))        ESCAPE (MEAS_F_AP_R6,       OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_ERR_AP_R6"))    ESCAPE (MEAS_F_ERR_AP_R6,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_STDEV_AP_R6"))  ESCAPE (MEAS_F_STDEV_AP_R6, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_FILL_AP_R6"))   ESCAPE (MEAS_F_FILL_AP_R6,  OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_AP_R7"))        ESCAPE (MEAS_F_AP_R7,       OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_ERR_AP_R7"))    ESCAPE (MEAS_F_ERR_AP_R7,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_STDEV_AP_R7"))  ESCAPE (MEAS_F_STDEV_AP_R7, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "F_FILL_AP_R7"))   ESCAPE (MEAS_F_FILL_AP_R7,  OPIHI_FLT);
+
   if (!strcasecmp (fieldName, "E_BV"))             ESCAPE (MEAS_E_BV          ,   OPIHI_FLT);
   if (!strcasecmp (fieldName, "E_BV_ERR"))         ESCAPE (MEAS_E_BV_ERR      ,   OPIHI_FLT);
Index: /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dvo_photcode_ops.c
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dvo_photcode_ops.c	(revision 38146)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dvo_photcode_ops.c	(revision 38147)
@@ -1822,2 +1822,20 @@
 LENSFIELD(E1_sh_psf);
 LENSFIELD(E2_sh_psf);
+
+LENSFIELD( F_ApR5);
+LENSFIELD(dF_ApR5);
+LENSFIELD(sF_ApR5);
+LENSFIELD(fF_ApR5);
+
+LENSFIELD( F_ApR6);
+LENSFIELD(dF_ApR6);
+LENSFIELD(sF_ApR6);
+LENSFIELD(fF_ApR6);
+
+LENSFIELD( F_ApR7);
+LENSFIELD(dF_ApR7);
+LENSFIELD(sF_ApR7);
+LENSFIELD(fF_ApR7);
+
+LENSFIELD(E1);
+LENSFIELD(E2);