Index: trunk/Ohana/src/libautocode/def/average.d
===================================================================
--- trunk/Ohana/src/libautocode/def/average.d	(revision 6454)
+++ trunk/Ohana/src/libautocode/def/average.d	(revision 6683)
@@ -2,13 +2,23 @@
 EXTNAME      DVO_AVERAGE
 TYPE         BINTABLE
-SIZE         44
+SIZE         76
 DESCRIPTION  DVO Average Object Table
 
 # elements of data structure / FITS table
 
-FIELD R_PS,           RA,         double,           RA,                	       	  decimal degrees 
-FIELD D_PS,           DEC,        double,           DEC,               	       	  decimal degrees 
-FIELD M_PS,           MAG,        float,            primary mag,       	       	  mag
-FIELD dM_PS,          MAG_ERR,    float,            error on primary mag,         mag
+FIELD R,              RA,         double,           RA,                	       	  decimal degrees 
+FIELD D,              DEC,        double,           DEC,               	       	  decimal degrees 
+FIELD dR,             RA_ERR,     float,            RA error                      arcsec
+FIELD dD,             DEC_ERR,    float,            DEC error                     arcsec
+
+FIELD uR,             U_RA,       float,            RA*cos(D) proper-motion,      arcsec/year
+FIELD uD,             U_DEC,      float,            DEC proper-motion,            arcsec/year
+FIELD duR,            V_RA_ERR,   float,            RA*cos(D) p-m error,          arcsec/year
+FIELD duD,            V_DEC_ERR,  float,            DEC p-m error,                arcsec/year
+FIELD P,              PAR,        float,            parallax,			  arcsec
+FIELD dP,             PAR_ERR,    float,            parallax error,               arcsec
+
+FIELD M,              MAG,        float,            primary mag,       	       	  mag
+FIELD dM,             MAG_ERR,    float,            error on primary mag,         mag
 FIELD Xp,             SIGMA_POS,  short, 	    position scatter,   	  1/100 arcsec
 FIELD Xm,             CHISQ_MAG,  short, 	    chisq for primary mag,        [100*log(value)]
@@ -20,9 +30,4 @@
 FIELD missing,        missing,    int,     	    offset to first missing obs
 
-# 
-# V_RA,   float,            proper-motion (arcsec/year),
-# V_DEC   float,            proper-motion (arcsec/year),
-# PAR     float             parallax (arcseconds)
-# D_V_RA  float,            proper-motion error (arcsec/year),
-# D_V_DEC float,            proper-motion error (arcsec/year),
-# D_PAR   float             parallax error (arcseconds)
+# this structure should only be used for internal representations
+# the average-FORMAT structures should be used for external representations