Index: trunk/Ohana/src/libautocode/def/measure.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure.d	(revision 4832)
+++ trunk/Ohana/src/libautocode/def/measure.d	(revision 4863)
@@ -2,27 +2,24 @@
 EXTNAME DVO_MEASURE
 TYPE    BINTABLE
-SIZE    36
+SIZE    50
 
 # elements of data structure / FITS table
 
-# these are the entries from the Elixir DB format:
-# FIELD dR,             D_RA,      short,          RA offset,                	  1/100 arcsec
-# FIELD dD,             D_DEC,     short,          DEC offset,               	  1/100 arcsec
+# drop _PS when conversion is complete
 
-# replace these with the above names 
-FIELD dR_PS,             D_RA,   float,          RA offset,                	  arcsec
-FIELD dD_PS,             D_DEC,  float,          DEC offset,               	  arcsec
-FIELD M,              MAG,        short,          catalog mag,       	       	  millimag
-FIELD Mcal,           Mcal,       short,          image cal mag,	          millimag
-FIELD Mgal,           Mgal,       short,          galaxy mag,			  millimag
-FIELD airmass,        airmass,    short,          (airmass - 1),		  milliairmass
+FIELD dR_PS,          D_RA,       float,          RA offset,                	  arcsec
+FIELD dD_PS,          D_DEC,      float,          DEC offset,               	  arcsec
+FIELD M_PS,           MAG,        float,          catalog mag,       	       	  mag
+FIELD Mcal_PS,        Mcal,       float,          image cal mag,	          mag
+FIELD Mgal_PS,        Mgal,       float,          galaxy mag,			  mag
+FIELD dM_PS,          dM,         float,          mag error,                      mag
+FIELD airmass_PS,     airmass,    float,          (airmass - 1),		  airmass
+FIELD dt_PS,          dt,         float,          exposure time,                  2.5*log(exptime)
+FIELD t,              t,          unsigned int,   time in seconds (UNIX)
 FIELD FWx,            FWx,        short,          object fwhm major axis,         1/100 of arcsec 
-FIELD dM,             dM,         unsigned char,  mag error,                      millimag
-FIELD fwy,            fwy,        unsigned char,  object fwhm minor/major ratio
+FIELD FWy_PS,         FWy,        short,          object fwhm minor axis,         1/100 of arcsec 
 FIELD theta,          theta,      unsigned char,  angle wrt ccd X dir,            (0xff/360) deg
 FIELD dophot,         dophot,     char,           dophot type
 FIELD source,         source,     unsigned short, photcode
-FIELD t,              t,          unsigned int,   time in seconds (UNIX)
+FIELD flags,          flags,      unsigned short, flags for various uses  
 FIELD averef,         averef,     unsigned int,   reference to average entry      
-FIELD dt,             dt,         short,          exposure time,                  2500*log(exptime)
-FIELD flags,          flags,      unsigned short, flags for various uses