Index: /trunk/Ohana/src/libdvo/include/dvodb.h
===================================================================
--- /trunk/Ohana/src/libdvo/include/dvodb.h	(revision 39567)
+++ /trunk/Ohana/src/libdvo/include/dvodb.h	(revision 39568)
@@ -83,4 +83,7 @@
   MAG_OPTION_E1_SH_PSF, 
   MAG_OPTION_E2_SH_PSF, 
+
+  MAG_OPTION_E1_PSF, 
+  MAG_OPTION_E2_PSF, 
 
   MAG_OPTION_F_AP_R5, 
@@ -258,4 +261,7 @@
       MEAS_E2_SH_PSF, 
 
+      MEAS_E1_PSF, 
+      MEAS_E2_PSF, 
+
       MEAS_F_AP_R5, 
       MEAS_F_ERR_AP_R5, 
Index: /trunk/Ohana/src/libdvo/src/dbExtractMeasures.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 39567)
+++ /trunk/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 39568)
@@ -276,4 +276,8 @@
 	case MAG_OPTION_E1_SH_PSF: 
 	case MAG_OPTION_E2_SH_PSF: 
+
+	case MAG_OPTION_E1_PSF: 
+	case MAG_OPTION_E2_PSF: 
+
 	case MAG_OPTION_F_AP_R5: 
 	case MAG_OPTION_F_ERR_AP_R5: 
@@ -749,50 +753,53 @@
       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; }
-    case MEAS_E_BV_ERR:         { value.Flt = starpar->dEbv;     break; }
-    case MEAS_DISTANCE_MOD:     { value.Flt = starpar->DistMag;  break; }
-    case MEAS_DISTANCE_MOD_ERR: { value.Flt = starpar->dDistMag; break; }
-    case MEAS_M_R:              { value.Flt = starpar->M_r;      break; }
-    case MEAS_M_R_ERR:          { value.Flt = starpar->dM_r;     break; }
-    case MEAS_FEH:              { value.Flt = starpar->FeH;      break; }
-    case MEAS_FEH_ERR:          { value.Flt = starpar->dFeH;     break; }
-    case MEAS_URA_GALMODEL:     { value.Flt = starpar->uRA;      break; }
-    case MEAS_UDEC_GALMODEL:    { value.Flt = starpar->uDEC;     break; }
-    case MEAS_RA_GALMODEL:      { value.Flt = starpar->R;        break; }
-    case MEAS_DEC_GALMODEL:     { value.Flt = starpar->D;        break; }
+    case MEAS_X11_SM_OBJ: { value.Flt = lensing ? lensing->X11_sm_obj : NAN; break; } 
+    case MEAS_X12_SM_OBJ: { value.Flt = lensing ? lensing->X12_sm_obj : NAN; break; } 
+    case MEAS_X22_SM_OBJ: { value.Flt = lensing ? lensing->X22_sm_obj : NAN; break; } 
+    case MEAS_E1_SM_OBJ:  { value.Flt = lensing ? lensing->E1_sm_obj  : NAN; break; } 
+    case MEAS_E2_SM_OBJ:  { value.Flt = lensing ? lensing->E2_sm_obj  : NAN; break; } 
+    case MEAS_X11_SH_OBJ: { value.Flt = lensing ? lensing->X11_sh_obj : NAN; break; } 
+    case MEAS_X12_SH_OBJ: { value.Flt = lensing ? lensing->X12_sh_obj : NAN; break; } 
+    case MEAS_X22_SH_OBJ: { value.Flt = lensing ? lensing->X22_sh_obj : NAN; break; } 
+    case MEAS_E1_SH_OBJ:  { value.Flt = lensing ? lensing->E1_sh_obj  : NAN; break; } 
+    case MEAS_E2_SH_OBJ:  { value.Flt = lensing ? lensing->E2_sh_obj  : NAN; break; } 
+    case MEAS_X11_SM_PSF: { value.Flt = lensing ? lensing->X11_sm_psf : NAN; break; } 
+    case MEAS_X12_SM_PSF: { value.Flt = lensing ? lensing->X12_sm_psf : NAN; break; } 
+    case MEAS_X22_SM_PSF: { value.Flt = lensing ? lensing->X22_sm_psf : NAN; break; } 
+    case MEAS_E1_SM_PSF:  { value.Flt = lensing ? lensing->E1_sm_psf  : NAN; break; } 
+    case MEAS_E2_SM_PSF:  { value.Flt = lensing ? lensing->E2_sm_psf  : NAN; break; } 
+    case MEAS_X11_SH_PSF: { value.Flt = lensing ? lensing->X11_sh_psf : NAN; break; } 
+    case MEAS_X12_SH_PSF: { value.Flt = lensing ? lensing->X12_sh_psf : NAN; break; } 
+    case MEAS_X22_SH_PSF: { value.Flt = lensing ? lensing->X22_sh_psf : NAN; break; } 
+    case MEAS_E1_SH_PSF:  { value.Flt = lensing ? lensing->E1_sh_psf  : NAN; break; } 
+    case MEAS_E2_SH_PSF:  { value.Flt = lensing ? lensing->E2_sh_psf  : NAN; break; } 
+
+    case MEAS_E1_PSF:     { value.Flt = lensing ? lensing->E1_psf     : NAN; break; } 
+    case MEAS_E2_PSF:     { value.Flt = lensing ? lensing->E2_psf     : NAN; break; } 
+
+    case MEAS_F_AP_R5:       { value.Flt = lensing ? lensing-> F_ApR5 : NAN; break; } 
+    case MEAS_F_ERR_AP_R5:   { value.Flt = lensing ? lensing->dF_ApR5 : NAN; break; } 
+    case MEAS_F_STDEV_AP_R5: { value.Flt = lensing ? lensing->sF_ApR5 : NAN; break; } 
+    case MEAS_F_FILL_AP_R5:  { value.Flt = lensing ? lensing->fF_ApR5 : NAN; break; } 
+    case MEAS_F_AP_R6:       { value.Flt = lensing ? lensing-> F_ApR6 : NAN; break; } 
+    case MEAS_F_ERR_AP_R6:   { value.Flt = lensing ? lensing->dF_ApR6 : NAN; break; } 
+    case MEAS_F_STDEV_AP_R6: { value.Flt = lensing ? lensing->sF_ApR6 : NAN; break; } 
+    case MEAS_F_FILL_AP_R6:  { value.Flt = lensing ? lensing->fF_ApR6 : NAN; break; } 
+    case MEAS_F_AP_R7:       { value.Flt = lensing ? lensing-> F_ApR7 : NAN; break; } 
+    case MEAS_F_ERR_AP_R7:   { value.Flt = lensing ? lensing->dF_ApR7 : NAN; break; } 
+    case MEAS_F_STDEV_AP_R7: { value.Flt = lensing ? lensing->sF_ApR7 : NAN; break; } 
+    case MEAS_F_FILL_AP_R7:  { value.Flt = lensing ? lensing->fF_ApR7 : NAN; break; } 
+
+    case MEAS_E_BV:             { value.Flt = starpar ? starpar->Ebv      : NAN; break; }
+    case MEAS_E_BV_ERR:         { value.Flt = starpar ? starpar->dEbv     : NAN; break; }
+    case MEAS_DISTANCE_MOD:     { value.Flt = starpar ? starpar->DistMag  : NAN; break; }
+    case MEAS_DISTANCE_MOD_ERR: { value.Flt = starpar ? starpar->dDistMag : NAN; break; }
+    case MEAS_M_R:              { value.Flt = starpar ? starpar->M_r      : NAN; break; }
+    case MEAS_M_R_ERR:          { value.Flt = starpar ? starpar->dM_r     : NAN; break; }
+    case MEAS_FEH:              { value.Flt = starpar ? starpar->FeH      : NAN; break; }
+    case MEAS_FEH_ERR:          { value.Flt = starpar ? starpar->dFeH     : NAN; break; }
+    case MEAS_URA_GALMODEL:     { value.Flt = starpar ? starpar->uRA      : NAN; break; }
+    case MEAS_UDEC_GALMODEL:    { value.Flt = starpar ? starpar->uDEC     : NAN; break; }
+    case MEAS_RA_GALMODEL:      { value.Flt = starpar ? starpar->R        : NAN; break; }
+    case MEAS_DEC_GALMODEL:     { value.Flt = starpar ? starpar->D        : NAN; break; }
 
     // case MEAS_FLUX_PSF: /* OK */
Index: /trunk/Ohana/src/libdvo/src/dbFields.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dbFields.c	(revision 39567)
+++ /trunk/Ohana/src/libdvo/src/dbFields.c	(revision 39568)
@@ -62,4 +62,7 @@
     if (fields[i].ID == MEAS_E2_SH_PSF)  return TRUE;
 
+    if (fields[i].ID == MEAS_E1_PSF)     return TRUE;
+    if (fields[i].ID == MEAS_E2_PSF)     return TRUE;
+
     if (fields[i].ID == MEAS_F_AP_R5)       return TRUE;
     if (fields[i].ID == MEAS_F_ERR_AP_R5)   return TRUE;
@@ -105,4 +108,7 @@
     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_E1_PSF)     return TRUE;
+    if (fields[i].magOption == MAG_OPTION_E2_PSF)     return TRUE;
 
     if (fields[i].magOption == MAG_OPTION_F_AP_R5)       return TRUE;
@@ -268,4 +274,6 @@
   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, "E1_PSF"))        return MAG_OPTION_E1_PSF; 
+  if (!strcasecmp (string, "E2_PSF"))        return MAG_OPTION_E2_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; 
@@ -621,4 +629,7 @@
   if (!strcasecmp (fieldName, "E2_SH_PSF"))      ESCAPE (MEAS_E2_SH_PSF,  OPIHI_FLT);
 
+  if (!strcasecmp (fieldName, "E1_PSF"))         ESCAPE (MEAS_E1_PSF,  OPIHI_FLT);
+  if (!strcasecmp (fieldName, "E2_PSF"))         ESCAPE (MEAS_E2_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);