Index: trunk/Ohana/src/libautocode/def/measure.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure.d	(revision 12332)
+++ trunk/Ohana/src/libautocode/def/measure.d	(revision 15038)
@@ -2,5 +2,5 @@
 EXTNAME      DVO_MEASURE
 TYPE         BINTABLE
-SIZE         96
+SIZE         104
 DESCRIPTION  DVO Detection Measurement Table 
 
@@ -11,18 +11,9 @@
 FIELD Mgal,           Mgal,         float,          galaxy mag,			  mag
 FIELD dM,             dM,           float,          mag error,                    mag
-FIELD airmass,        airmass,      float,          (airmass - 1),		  airmass
 FIELD dt,             dt,           float,          exposure time,                2.5*log(exptime)
 
-FIELD t,              t,            unsigned int,   time in seconds (UNIX)
-FIELD averef,         averef,       unsigned int,   reference to average entry      
-
-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 dophot,         dophot,       char,           dophot type
-FIELD stargal,        stargal,      char,           star-galaxy separator
+# note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation
+FIELD airmass,        airmass,      float,          (airmass - 1),		  airmass
+FIELD az,             AZ,           float,          telescope azimuth
 
 # new field elements needed for Pan-STARRS:
@@ -34,20 +25,32 @@
 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      
+
+# Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
+FIELD detID,          DET_ID,       unsigned int,   detection ID
+FIELD imageID,        IMAGE_ID,     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 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
 
-# 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 stargal,        stargal,      char,           star-galaxy separator
 
-FIELD imageID_hi,     IMAGE_ID_HI,  unsigned int,   reference to image
-FIELD imageID_lo,     IMAGE_ID_LO,  unsigned int,   reference to image
+# absorb these into photFlags?
+FIELD dophot,         dophot,       char,           dophot type
 
-# note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation
-FIELD az,             AZ,           float,          telescope azimuth
-
-# we need extra bytes for padding purposes...
-FIELD dummy,          dummy,        char[2],        padding
+FIELD dummy,          DUMMY,        char[2],        padding