Index: trunk/Ohana/src/libautocode/def/measure-ps1-dev-1.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure-ps1-dev-1.d	(revision 15034)
+++ trunk/Ohana/src/libautocode/def/measure-ps1-dev-1.d	(revision 15038)
@@ -2,5 +2,5 @@
 EXTNAME      DVO_MEASURE_PS1_DEV_1
 TYPE         BINTABLE
-SIZE         96
+SIZE         104
 DESCRIPTION  DVO Detection Measurement Table 
 
@@ -8,11 +8,11 @@
 FIELD dD,             D_DEC,        float,          DEC offset,               	  arcsec
 FIELD M,              MAG,          float,          catalog mag,       	       	  mag
-FIELD Mcal,           Mcal,         float,          image cal mag,	          mag
-FIELD Mgal,           Mgal,         float,          galaxy mag,			  mag
-FIELD dM,             dM,           float,          mag error,                    mag
-FIELD dt,             dt,           float,          exposure time,                2.5*log(exptime)
+FIELD Mcal,           M_CAL,        float,          image cal mag,	          mag
+FIELD Mgal,           M_GAL,        float,          galaxy mag,			  mag
+FIELD dM,             MAG_ERR,      float,          mag error,                    mag
+FIELD dt,             M_TIME,       float,          exposure time,                2.5*log(exptime)
 
 # note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation
-FIELD airmass,        airmass,      float,          (airmass - 1),		  airmass
+FIELD airmass,        AIRMASS,      float,          (airmass - 1),		  airmass
 FIELD az,             AZ,           float,          telescope azimuth
 
@@ -25,34 +25,36 @@
 FIELD dSky,           SKY_FLUX_ERR, float,          local estimate of sky flux,    counts/sec
 
-FIELD t,              t,            unsigned int,   time in seconds (UNIX)
-FIELD averef,         averef,       unsigned int,   reference to average entry      
+FIELD t,              TIME,         unsigned int,   time in seconds (UNIX)
+FIELD averef,         AVE_REF,      unsigned int,   reference to average entry      
 
 # Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
-FIELD detID_hi,       DET_ID_HI,    unsigned int,   ID upper bytes
-FIELD detID_lo,       DET_ID_LO,    unsigned int,   ID lower bytes
+FIELD detID,          DET_ID,       unsigned int,   ID upper bytes
+FIELD imageID,        IMAGE_ID,     unsigned int,   reference to image
 
-FIELD imageID_hi,     IMAGE_ID_HI,  unsigned int,   reference to image
-FIELD imageID_lo,     IMAGE_ID_LO,  unsigned int,   reference to image
+# do we need more resolution than a short? should this be a log?
+FIELD qPSF,           PSF_QF,       float,          psf coverage/quality factor
+FIELD psfProb,        PSF_PROB,     float,          psf coverage/quality factor
+FIELD crNsigma,       CR_NSIGMA,    float,          psf coverage/quality factor
+FIELD extNsigma,      EXT_NSIGMA,   float,          psf coverage/quality factor
 
-FIELD FWx,            FWx,          short,          object fwhm major axis,       1/100 of arcsec 
-FIELD FWy,            FWy,          short,          object fwhm minor axis,       1/100 of arcsec 
-FIELD theta,          theta,        short,          angle wrt ccd X dir,          (0xffff/360) deg
-FIELD photcode,       photcode,     unsigned short, photcode
-
-FIELD flags,          flags,        unsigned short, flags for various uses  
+FIELD FWx,            FWHM_MAJOR,   short,          object fwhm major axis,       1/100 of arcsec 
+FIELD FWy,            FWHM_MINOR,   short,          object fwhm minor axis,       1/100 of arcsec 
+FIELD theta,          PSF_THETA,    short,          angle wrt ccd X dir,          (0xffff/360) deg
+FIELD photcode,       PHOTCODE,     unsigned short, photcode
 
 FIELD dXccd,          X_CCD_ERR,    short,          X coord error on chip,         pixels
 FIELD dYccd,          Y_CCD_ERR,    short,          Y coord error on chip,         pixels
 
-# do we need more resolution than a short? should this be a log?
-FIELD qPSF,           PSF_QF,       short,          psf coverage/quality factor
+FIELD dbFlags,        DB_FLAGS,     unsigned short, flags for various uses  
+FIELD photFlags,      PHOT_FLAGS,   unsigned short, flags supplied by photometry program
 
-FIELD dophot,         dophot,       char,           dophot type
-FIELD stargal,        stargal,      char,           star-galaxy separator
+FIELD stargal,        STAR_GAL,     char,           star-galaxy separator
 
-# we need extra bytes for padding purposes...
-FIELD dummy,          dummy,        char[2],        padding
+# absorb these into photFlags?
+FIELD dophot,         DOPHOT,       char,           dophot type
 
-# float : 13 x 4 = 52
+FIELD dummy,          DUMMY,        char[2],        padding
+
+# float : 17 x 4 = 68
 # int:     6 x 4 = 24
 # short:   8 x 2 = 16