Index: trunk/Ohana/src/libdvo/include/dvo.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvo.h	(revision 6643)
+++ trunk/Ohana/src/libdvo/include/dvo.h	(revision 6683)
@@ -6,7 +6,9 @@
 # define DVO_H
 
-# define ELIXIR 1
-# define PANSTARRS 0
-# define LONEOS 0
+/*
+  # define ELIXIR 1
+  # define PANSTARRS 0
+  # define LONEOS 0
+*/
 
 /*** named data values (convert all to enums?) ***/
@@ -16,5 +18,5 @@
 
 /* DVO table formats */
-enum {DVO_FORMAT_UNDEF, DVO_FORMAT_INTERNAL, DVO_FORMAT_ELIXIR, DVO_FORMAT_LONEOS, DVO_FORMAT_PANSTARRS} DVOTableFormat;
+enum {DVO_FORMAT_UNDEF, DVO_FORMAT_INTERNAL, DVO_FORMAT_ELIXIR, DVO_FORMAT_LONEOS, DVO_FORMAT_PANSTARRS, DVO_FORMAT_PMTEST} DVOTableFormat;
 
 /* image data modes in RegImage */
@@ -63,10 +65,10 @@
 /* some subtle distinctions between the blend flags:
    BLEND_IMAGE: the star on an image is matched with more 
-      than one star in the catalog (image has worse seeing than catalog)
+   than one star in the catalog (image has worse seeing than catalog)
    BLEND_CATALOG: the star in the catalog is matched with more 
-      than one star on the image (image has better seeing than catalog)
+   than one star on the image (image has better seeing than catalog)
    CALIBRATED: relative photometry has been performed on this measurement
    BLEND_IMAGE_NEIGHBOR: the star on an image is matched with more 
-      than one star in the catalog, but not in the same catalog file.
+   than one star in the catalog, but not in the same catalog file.
 */
 
@@ -285,7 +287,9 @@
 Average *AverageElixirToInternal (AverageElixir *in, int Nvalues);
 Average *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues);
+Average *AveragePMtestToInternal (AveragePMtest *in, int Nvalues);
 AverageLoneos *AverageInternalToLoneos (Average *in, int Nvalues);
 AverageElixir *AverageInternalToElixir (Average *in, int Nvalues);
 AveragePanstarrs *AverageInternalToPanstarrs (Average *in, int Nvalues);
+AveragePMtest *AverageInternalToPMtest (Average *in, int Nvalues);
 
 Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format);