Index: trunk/Ohana/src/libautocode/Makefile
===================================================================
--- trunk/Ohana/src/libautocode/Makefile	(revision 4800)
+++ trunk/Ohana/src/libautocode/Makefile	(revision 4832)
@@ -25,6 +25,12 @@
 $(SRC)/coords.$(ARCH).o \
 $(SRC)/average.$(ARCH).o \
+$(SRC)/average-loneos.$(ARCH).o \
+$(SRC)/average-elixir.$(ARCH).o \
+$(SRC)/average-panstarrs.$(ARCH).o \
 $(SRC)/secfilt.$(ARCH).o \
 $(SRC)/measure.$(ARCH).o \
+$(SRC)/measure-loneos.$(ARCH).o \
+$(SRC)/measure-elixir.$(ARCH).o \
+$(SRC)/measure-panstarrs.$(ARCH).o \
 $(SRC)/missing.$(ARCH).o \
 $(SRC)/photcode.$(ARCH).o \
@@ -41,6 +47,12 @@
 $(INC)/coords.h \
 $(INC)/average.h \
+$(INC)/average-loneos.h \
+$(INC)/average-elixir.h \
+$(INC)/average-panstarrs.h \
 $(INC)/secfilt.h \
 $(INC)/measure.h \
+$(INC)/measure-loneos.h \
+$(INC)/measure-elixir.h \
+$(INC)/measure-panstarrs.h \
 $(INC)/missing.h \
 $(INC)/photcode.h \
Index: trunk/Ohana/src/libautocode/def/average-elixir.d
===================================================================
--- trunk/Ohana/src/libautocode/def/average-elixir.d	(revision 4800)
+++ trunk/Ohana/src/libautocode/def/average-elixir.d	(revision 4832)
@@ -1,4 +1,4 @@
-STRUCT  Average
-EXTNAME DVO_AVERAGE
+STRUCT  AverageElixir
+EXTNAME DVO_AVERAGE_ELIXIR
 TYPE    BINTABLE
 SIZE    32
Index: trunk/Ohana/src/libautocode/def/average.d
===================================================================
--- trunk/Ohana/src/libautocode/def/average.d	(revision 4800)
+++ trunk/Ohana/src/libautocode/def/average.d	(revision 4832)
@@ -6,6 +6,6 @@
 # elements of data structure / FITS table
 
-FIELD R_PS,              RA,         double,            RA,                	       	  decimal degrees 
-FIELD D_PS,              DEC,        double,            DEC,               	       	  decimal degrees 
+FIELD R_PS,           RA,         double,           RA,                	       	  decimal degrees 
+FIELD D_PS,           DEC,        double,           DEC,               	       	  decimal degrees 
 FIELD M,              MAG,        short,            primary mag,       	       	  millimag
 FIELD Nm,             NMEAS,      unsigned short,   number of measures
Index: trunk/Ohana/src/libautocode/def/measure-elixir.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure-elixir.d	(revision 4800)
+++ trunk/Ohana/src/libautocode/def/measure-elixir.d	(revision 4832)
@@ -1,4 +1,4 @@
-STRUCT  Measure
-EXTNAME DVO_MEASURE
+STRUCT  MeasureElixir
+EXTNAME DVO_MEASURE_ELIXIR
 TYPE    BINTABLE
 SIZE    32
Index: trunk/Ohana/src/libautocode/def/measure-panstarrs.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure-panstarrs.d	(revision 4800)
+++ trunk/Ohana/src/libautocode/def/measure-panstarrs.d	(revision 4832)
@@ -1,4 +1,4 @@
-STRUCT  Measure
-EXTNAME DVO_MEASURE
+STRUCT  MeasurePanstarrs
+EXTNAME DVO_MEASURE_PANSTARRS
 TYPE    BINTABLE
 SIZE    32
Index: trunk/Ohana/src/libautocode/def/measure.d
===================================================================
--- trunk/Ohana/src/libautocode/def/measure.d	(revision 4800)
+++ trunk/Ohana/src/libautocode/def/measure.d	(revision 4832)
@@ -9,8 +9,8 @@
 # FIELD dR,             D_RA,      short,          RA offset,                	  1/100 arcsec
 # FIELD dD,             D_DEC,     short,          DEC offset,               	  1/100 arcsec
+
 # replace these with the above names 
 FIELD dR_PS,             D_RA,   float,          RA offset,                	  arcsec
 FIELD dD_PS,             D_DEC,  float,          DEC offset,               	  arcsec
-
 FIELD M,              MAG,        short,          catalog mag,       	       	  millimag
 FIELD Mcal,           Mcal,       short,          image cal mag,	          millimag