Index: /branches/eam_branch_20090208/Ohana/src/libautocode/def/Stars.d
===================================================================
--- /branches/eam_branch_20090208/Ohana/src/libautocode/def/Stars.d	(revision 21416)
+++ /branches/eam_branch_20090208/Ohana/src/libautocode/def/Stars.d	(revision 21417)
@@ -4,8 +4,8 @@
 SIZE    248
 
-FIELD     X,                X,          double,    x coordinate on image,	     pixels
-FIELD     Y,                Y,          double,    y coordinate on image,	     pixels
-FIELD     dX,               dX,         double,    x coordinate error,	             pixels
-FIELD     dY,               dY,         double,    y coordinate error,  	     pixels
+FIELD     Xccd,             X,          double,    x coordinate on image,	     pixels
+FIELD     Yccd,             Y,          double,    y coordinate on image,	     pixels
+FIELD     dXccd,            dX,         double,    x coordinate error,	             pixels
+FIELD     dYccd,            dY,         double,    y coordinate error,  	     pixels
 FIELD     R,                R,          double,    ra coordinate on sky,	     decimal degrees
 FIELD     D,                D,          double,    dec coordinate on sky,	     decimal degrees
@@ -21,10 +21,9 @@
 FIELD     dM,               DM,         double,    error on mag
 FIELD     dMcal,            DMCAL,      double,    systematic error on mag
-FIELD     sky,              SKY,        double,    local sky counts
-FIELD     dsky,             dSKY,       double,    local sky error counts
+FIELD     Sky,              SKY,        double,    local sky counts
+FIELD     dSky,             dSKY,       double,    local sky error counts
 FIELD     fx,               FX,         double,    object FWHM x-dir,		     pixels?
 FIELD     fy,               FY,         double,    object FWHM y-dir,		     pixels?
 FIELD     df,               DF,         double,    object position angle,	     degrees
-# FIELD     Mgal,             MGAL,       double,    alternative (galaxy) magnitude
 FIELD     Map,              MAP,        double,    alternative (aperture) magnitude
 FIELD     Mpeak,            MPEAK,      double,    alternative (peak) magnitude
@@ -41,11 +40,8 @@
 FIELD     airmass,          AIRMASS,    float,     (airmass - 1),		     airmass
 FIELD     az,     	    AZ,         float,     azimuth
-FIELD     code,             CODE,       short
+FIELD     photcode,         CODE,       short
 FIELD     nFrames,          N_FRAMES,   short
-FIELD     flags,            FLAGS,      short
-FIELD     dophot,           DOPHOT,     char,      dophot type code
-FIELD     dummy,            DUMMY,      char
-
-# XXX I'm going to need azimuth (or load from image header?)
+FIELD     photFlags,        FLAGS,      short
+FIELD     dummy,            DUMMY,      char[2]
 
 # double:   24 * 8 : 192
@@ -58,2 +54,4 @@
 # define down the types to floats where reasonable (all but R,D)?
 # R,D should be in ICRS, J2000, epoch 2000 : precess as needed, apply p-m as needed
+
+# XXX I'd like to merge this with Measure, but need to be careful about addstarClient -> addstarServer