Index: trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c	(revision 26285)
+++ trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c	(revision 27587)
@@ -10,6 +10,4 @@
 static int TimeFormat;
 
-static time_t TimeRefPM;
-
 static CoordTransform *celestial_to_galactic = NULL;
 static CoordTransform *celestial_to_ecliptic = NULL;
@@ -32,5 +30,4 @@
 
 int dbExtractMeasuresInit () {
-  TimeRefPM = ohana_date_to_sec ("2000/01/01");
   GetTimeFormat (&TimeReference, &TimeFormat);
   return (TRUE);
@@ -252,6 +249,18 @@
       value.Flt = average[0].D;
       break;
-    case MEAS_XP: /* OK */
-      value.Flt = average[0].Xp;
+    case MEAS_CHISQ_POS: /* OK */
+      value.Flt = average[0].ChiSqAve;
+      break;
+    case MEAS_CHISQ_PM: /* OK */
+      value.Flt = average[0].ChiSqPM;
+      break;
+    case MEAS_CHISQ_PAR: /* OK */
+      value.Flt = average[0].ChiSqPar;
+      break;
+    case MEAS_TMEAN: /* OK */
+      value.Flt = TimeValue (average[0].Tmean, TimeReference, TimeFormat);
+      break;
+    case MEAS_TRANGE: /* OK */
+      value.Flt = TimeValue (average[0].Trange, 0, TimeFormat);
       break;
     case MEAS_NMEAS: /* OK */
@@ -261,5 +270,8 @@
       value.Int = average[0].Nmissing;
       break;
-    case MEAS_OBJFLAGS: /* OK */
+    case MEAS_NPOS: /* OK */
+      value.Int = average[0].Npos;
+      break;
+    case MEAS_OBJ_FLAGS: /* OK */
       value.Int = average[0].flags;
       break;
@@ -273,9 +285,9 @@
       break;
     case MEAS_RA_FIT_OFFSET: /* OK */
-      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
+      dT = (measure[0].t - average[0].Tmean) / (86400*365.25);
       value.Flt = average[0].uR * dT + measure[0].dR;
       break;
     case MEAS_DEC_FIT_OFFSET: /* OK */
-      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
+      dT = (measure[0].t - average[0].Tmean) / (86400*365.25);
       value.Flt = average[0].uD * dT + measure[0].dD;
       break;
@@ -315,4 +327,13 @@
     case MEAS_THETA: /* OK */
       value.Flt = measure[0].theta;
+      break;
+    case MEAS_MXX: /* OK */
+      value.Flt = measure[0].Mxx;
+      break;
+    case MEAS_MXY: /* OK */
+      value.Flt = measure[0].Mxy;
+      break;
+    case MEAS_MYY: /* OK */
+      value.Flt = measure[0].Myy;
       break;
     case MEAS_DOPHOT: /* OK */
@@ -358,8 +379,8 @@
       break;
     case MEAS_XCCD_ERR: /* OK */
-      value.Flt = measure[0].dXccd;
+      value.Flt = measure[0].dXccd / 100.0;
       break;
     case MEAS_YCCD_ERR: /* OK */
-      value.Flt = measure[0].dYccd;
+      value.Flt = measure[0].dYccd / 100.0;
       break;
     case MEAS_XMOSAIC: /* OK */
@@ -404,4 +425,10 @@
       value.Flt = measure[0].psfChisq;
       break;
+    case MEAS_PSF_NDOF: /* OK */
+      value.Int = measure[0].psfNdof;
+      break;
+    case MEAS_PSF_NPIX: /* OK */
+      value.Int = measure[0].psfNpix;
+      break;
     case MEAS_CR_NSIGMA: /* OK */
       value.Flt = measure[0].crNsigma;