Index: /branches/eam_branch_20080201/Ohana/src/libautocode/def/average.d
===================================================================
--- /branches/eam_branch_20080201/Ohana/src/libautocode/def/average.d	(revision 16272)
+++ /branches/eam_branch_20080201/Ohana/src/libautocode/def/average.d	(revision 16273)
@@ -20,9 +20,12 @@
 
 FIELD Xp,             SIGMA_POS,  short, 	    position scatter,   	  1/100 arcsec
-FIELD Nm,             NMEAS,      unsigned short,   number of measures
-FIELD Nn,             NMISS,      unsigned short,   number of missings
+FIELD Npsf,           NPSF,       unsigned short,   number of psf measurements
+FIELD Next,           NEXT,       unsigned short,   number of extended measurements
+FIELD Nmiss,          NMISS,      unsigned short,   number of missings
+FIELD psfOffset,      OFF_PSF,    int,     	    offset to first measurement
+FIELD extOffset,      OFF_EXT,    int,     	    offset to first measurement
+FIELD missOffset,     OFF_MISS,   int,     	    offset to first missing obs
+
 FIELD code,           code,       unsigned short,   ID code (star; ghost; etc)
-FIELD offset,         offset,     int,     	    offset to first measurement
-FIELD missing,        missing,    int,     	    offset to first missing obs
 
 # Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?