Index: trunk/Ohana/src/libautocode/Makefile
===================================================================
--- trunk/Ohana/src/libautocode/Makefile	(revision 4864)
+++ trunk/Ohana/src/libautocode/Makefile	(revision 4865)
@@ -29,4 +29,6 @@
 $(SRC)/average-panstarrs.$(ARCH).o \
 $(SRC)/secfilt.$(ARCH).o \
+$(SRC)/secfilt-elixir.$(ARCH).o \
+$(SRC)/secfilt-panstarrs.$(ARCH).o \
 $(SRC)/measure.$(ARCH).o \
 $(SRC)/measure-loneos.$(ARCH).o \
@@ -51,4 +53,6 @@
 $(INC)/average-panstarrs.h \
 $(INC)/secfilt.h \
+$(INC)/secfilt-elixir.h \
+$(INC)/secfilt-panstarrs.h \
 $(INC)/measure.h \
 $(INC)/measure-loneos.h \
Index: trunk/Ohana/src/libautocode/def/average-elixir.d
===================================================================
--- trunk/Ohana/src/libautocode/def/average-elixir.d	(revision 4864)
+++ trunk/Ohana/src/libautocode/def/average-elixir.d	(revision 4865)
@@ -12,8 +12,8 @@
 FIELD Nn,             NMISS,      unsigned short,   number of missings
 FIELD Xp,             SIGMA_POS,  short, 	    position scatter,   	  1/100 arcsec
-FIELD Xm,             CHISQ_MAG,  short, 	    chisq for primary mag,        [1000*value]  ?
+FIELD Xm,             CHISQ_MAG,  short, 	    chisq for primary mag,        [100*log(value)]  ?
 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
-FIELD dM,             MAG_ERR,    short,            error on primary mag,         [1000*log(value)] ?
+FIELD dM,             MAG_ERR,    short,            error on primary mag,         millimag
 FIELD Xg,             Xg,         short,            best chisq value
Index: trunk/Ohana/src/libautocode/def/average-panstarrs.d
===================================================================
--- trunk/Ohana/src/libautocode/def/average-panstarrs.d	(revision 4864)
+++ trunk/Ohana/src/libautocode/def/average-panstarrs.d	(revision 4865)
@@ -2,5 +2,5 @@
 EXTNAME DVO_AVERAGE_PANSTARRS
 TYPE    BINTABLE
-SIZE    40
+SIZE    44
 
 # elements of data structure / FITS table
@@ -8,12 +8,12 @@
 FIELD R,              RA,         double,           RA,                	       	  decimal degrees 
 FIELD D,              DEC,        double,           DEC,               	       	  decimal degrees 
-FIELD M,              MAG,        short,            primary mag,       	       	  millimag
+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)]
+FIELD Xg,             CHISQ_GAL,  short,            chisq for galaxy mag          [100*log(value)]
 FIELD Nm,             NMEAS,      unsigned short,   number of measures
 FIELD Nn,             NMISS,      unsigned short,   number of missings
-FIELD Xp,             SIGMA_POS,  short, 	    position scatter,   	  1/100 arcsec
-FIELD Xm,             CHISQ_MAG,  short, 	    chisq for primary mag,        [1000*value]  ?
 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
-FIELD dM,             MAG_ERR,    short,            error on primary mag,         [1000*log(value)] ?
-FIELD Xg,             Xg,         short,            best chisq value
Index: trunk/Ohana/src/libautocode/def/average.d
===================================================================
--- trunk/Ohana/src/libautocode/def/average.d	(revision 4864)
+++ trunk/Ohana/src/libautocode/def/average.d	(revision 4865)
@@ -2,5 +2,5 @@
 EXTNAME DVO_AVERAGE
 TYPE    BINTABLE
-SIZE    40
+SIZE    44
 
 # elements of data structure / FITS table
@@ -8,12 +8,12 @@
 FIELD R_PS,           RA,         double,           RA,                	       	  decimal degrees 
 FIELD D_PS,           DEC,        double,           DEC,               	       	  decimal degrees 
-FIELD M,              MAG,        short,            primary mag,       	       	  millimag
+FIELD M_PS,           MAG,        float,            primary mag,       	       	  mag
+FIELD dM_PS,          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)]
+FIELD Xg,             CHISQ_GAL,  short,            chisq for galaxy mags,        [100*log(value)]
 FIELD Nm,             NMEAS,      unsigned short,   number of measures
 FIELD Nn,             NMISS,      unsigned short,   number of missings
-FIELD Xp,             SIGMA_POS,  short, 	    position scatter,   	  1/100 arcsec
-FIELD Xm,             CHISQ_MAG,  short, 	    chisq for primary mag,        [1000*value]  ?
 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
-FIELD dM,             MAG_ERR,    short,            error on primary mag,         [1000*log(value)] ?
-FIELD Xg,             Xg,         short,            best chisq value
Index: trunk/Ohana/src/libautocode/def/measure-panstarrs.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure-panstarrs.d	(revision 4864)
+++ trunk/Ohana/src/libautocode/def/measure-panstarrs.d	(revision 4865)
@@ -2,22 +2,22 @@
 EXTNAME DVO_MEASURE_PANSTARRS
 TYPE    BINTABLE
-SIZE    32
+SIZE    50
 
 # elements of data structure / FITS table
 
-FIELD dR,             D_RA,       short,          RA offset,                	  1/100 arcsec
-FIELD dD,             D_DEC,      short,          DEC offset,               	  1/100 arcsec
-FIELD M,              MAG,        short,          catalog mag,       	       	  millimag
-FIELD Mcal,           Mcal,       short,          image cal mag,	          millimag
-FIELD Mgal,           Mgal,       short,          galaxy mag,			  millimag
-FIELD airmass,        airmass,    short,          (airmass - 1),		  milliairmass
+FIELD dR,             D_RA,       float,          RA offset,                	  arcsec
+FIELD dD,             D_DEC,      float,          DEC offset,               	  arcsec
+FIELD M,              MAG,        float,          catalog mag,       	       	  mag
+FIELD dM,             dM,         float,          mag error,                      mag
+FIELD Mcal,           Mcal,       float,          image cal mag,	          mag
+FIELD Mgal,           Mgal,       float,          galaxy mag,			  mag
+FIELD airmass,        airmass,    float,          (airmass - 1),		  airmass
+FIELD dt,             dt,         float,          exposure time,                  2.5*log(exptime)
 FIELD FWx,            FWx,        short,          object fwhm major axis,         1/100 of arcsec 
-FIELD dM,             dM,         unsigned char,  mag error,                      millimag
-FIELD fwy,            fwy,        unsigned char,  object fwhm minor/major ratio
+FIELD FWy,            FWy,        short,          object fwhm minor axis,         1/100 of arcsec 
 FIELD theta,          theta,      unsigned char,  angle wrt ccd X dir,            (0xff/360) deg
 FIELD dophot,         dophot,     char,           dophot type
 FIELD source,         source,     unsigned short, photcode
+FIELD flags,          flags,      unsigned short, flags for various uses  
 FIELD t,              t,          unsigned int,   time in seconds (UNIX)
 FIELD averef,         averef,     unsigned int,   reference to average entry      
-FIELD dt,             dt,         short,          exposure time,                  2500*log(exptime)
-FIELD flags,          flags,      unsigned short, flags for various uses  
Index: trunk/Ohana/src/libautocode/def/measure.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure.d	(revision 4864)
+++ trunk/Ohana/src/libautocode/def/measure.d	(revision 4865)
@@ -16,10 +16,10 @@
 FIELD airmass_PS,     airmass,    float,          (airmass - 1),		  airmass
 FIELD dt_PS,          dt,         float,          exposure time,                  2.5*log(exptime)
-FIELD t,              t,          unsigned int,   time in seconds (UNIX)
 FIELD FWx,            FWx,        short,          object fwhm major axis,         1/100 of arcsec 
-FIELD FWy_PS,         FWy,        short,          object fwhm minor axis,         1/100 of arcsec 
+FIELD FWy,            FWy,        short,          object fwhm minor axis,         1/100 of arcsec 
 FIELD theta,          theta,      unsigned char,  angle wrt ccd X dir,            (0xff/360) deg
 FIELD dophot,         dophot,     char,           dophot type
 FIELD source,         source,     unsigned short, photcode
 FIELD flags,          flags,      unsigned short, flags for various uses  
+FIELD t,              t,          unsigned int,   time in seconds (UNIX)
 FIELD averef,         averef,     unsigned int,   reference to average entry      
Index: trunk/Ohana/src/libautocode/def/secfilt-elixir.d
===================================================================
--- trunk/Ohana/src/libautocode/def/secfilt-elixir.d	(revision 4865)
+++ trunk/Ohana/src/libautocode/def/secfilt-elixir.d	(revision 4865)
@@ -0,0 +1,9 @@
+STRUCT  SecFiltElixir
+EXTNAME DVO_SECFILT_ELIXIR
+TYPE    BINTABLE
+SIZE    6
+
+# elements of data structure / FITS table
+FIELD  M,  MAG,      short,                other mags,       millimags
+FIELD  Xm, MAG_CHI,  short,                chisq on mag
+FIELD  dM, MAG_ERR,  short,                scatter on mag
Index: trunk/Ohana/src/libautocode/def/secfilt-panstarrs.d
===================================================================
--- trunk/Ohana/src/libautocode/def/secfilt-panstarrs.d	(revision 4865)
+++ trunk/Ohana/src/libautocode/def/secfilt-panstarrs.d	(revision 4865)
@@ -0,0 +1,9 @@
+STRUCT  SecFiltPanstarrs
+EXTNAME DVO_SECFILT_PANSTARRS
+TYPE    BINTABLE
+SIZE    8
+
+# elements of data structure / FITS table
+FIELD  M,  MAG,      float,                other mags,       mags
+FIELD  dM, MAG_ERR,  short,                scatter on mag    1e4*mag
+FIELD  Xm, MAG_CHI,  short,                chisq on mag,     [100*log(value)]
Index: trunk/Ohana/src/libautocode/def/secfilt.d
===================================================================
--- trunk/Ohana/src/libautocode/def/secfilt.d	(revision 4864)
+++ trunk/Ohana/src/libautocode/def/secfilt.d	(revision 4865)
@@ -2,8 +2,8 @@
 EXTNAME DVO_SECFILT
 TYPE    BINTABLE
-SIZE    6
+SIZE    10
 
 # elements of data structure / FITS table
-FIELD  M,  MAG,      short,                other mags,       millimags
-FIELD  Xm, MAG_CHI,  short,                chisq on mag
-FIELD  dM, MAG_ERR,  short,                scatter on mag
+FIELD  M_PS,  MAG,      float,                other mags,       mags
+FIELD  dM_PS, MAG_ERR,  float,                scatter on mag    mags
+FIELD  Xm,    MAG_CHI,  short,                chisq on mag      [100*log(value)]