Index: trunk/Ohana/src/libautocode/def/measure-ps1-dev-2.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure-ps1-dev-2.d	(revision 16266)
+++ trunk/Ohana/src/libautocode/def/measure-ps1-dev-2.d	(revision 16810)
@@ -1,6 +1,6 @@
-STRUCT       Measure_PS1_DEV_1
-EXTNAME      DVO_MEASURE_PS1_DEV_1
+STRUCT       Measure_PS1_DEV_2
+EXTNAME      DVO_MEASURE_PS1_DEV_2
 TYPE         BINTABLE
-SIZE         104
+SIZE         112
 DESCRIPTION  DVO Detection Measurement Table 
 
@@ -9,6 +9,7 @@
 FIELD M,              MAG,          float,          catalog mag,       	       	  mag
 FIELD Mcal,           M_CAL,        float,          image cal mag,	          mag
-FIELD Mgal,           M_GAL,        float,          galaxy mag,			  mag
+FIELD Map,            M_APER,       float,          aperture mag,		  mag
 FIELD dM,             MAG_ERR,      float,          mag error,                    mag
+FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error, mag
 FIELD dt,             M_TIME,       float,          exposure time,                2.5*log(exptime)
 
@@ -30,11 +31,11 @@
 # 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
+FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
 
 # 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 psfChisq,       PSF_CHISQ,    float,          psf fit chisq
+FIELD crNsigma,       CR_NSIGMA,    float,          Nsigma deviation towards CR
+FIELD extNsigma,      EXT_NSIGMA,   float,          Nsigma deviation towards EXT
 
 FIELD FWx,            FWHM_MAJOR,   short,          object fwhm major axis,       1/100 of arcsec 
@@ -54,3 +55,3 @@
 FIELD dophot,         DOPHOT,       char,           dophot type
 
-FIELD dummy,          DUMMY,        char[2],        padding
+FIELD dummy,          DUMMY,        char[6],        padding