Index: trunk/Ohana/src/libdvo/include/dvo.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvo.h	(revision 14446)
+++ trunk/Ohana/src/libdvo/include/dvo.h	(revision 15035)
@@ -19,11 +19,10 @@
 /* DVO table formats */
 typedef enum {DVO_FORMAT_UNDEF, 
-      DVO_FORMAT_INTERNAL, 
-      DVO_FORMAT_ELIXIR, 
-      DVO_FORMAT_LONEOS, 
-      DVO_FORMAT_PANSTARRS, 
-      DVO_FORMAT_PMTEST, 
-      DVO_FORMAT_PANSTARRS_DEV_0,
-      DVO_FORMAT_PANSTARRS_DEV_1
+	      DVO_FORMAT_INTERNAL, 
+	      DVO_FORMAT_ELIXIR, 
+	      DVO_FORMAT_LONEOS, 
+	      DVO_FORMAT_PANSTARRS_DEV_0,
+	      DVO_FORMAT_PANSTARRS_DEV_1,
+	      DVO_FORMAT_PS1_DEV_1
 } DVOTableFormat;
 
@@ -33,18 +32,18 @@
 
 typedef enum {
-    PROJ_NONE, // undefined
-    PROJ_ZEA, // zenithal
-    PROJ_ZPL, // zenithal
-    PROJ_ARC, // zenithal
-    PROJ_STG, // zenithal
-    PROJ_SIN, // zenithal
-    PROJ_TAN, // zenithal
-    PROJ_DIS, // zenithal (TAN + polyterms)
-    PROJ_LIN, // cartesian
-    PROJ_PLY, // cartesian
-    PROJ_WRP, // cartesian
-    PROJ_AIT, // pseudocyl
-    PROJ_GLS, // pseudocyl
-    PROJ_PAR, // pseudocyl
+  PROJ_NONE, // undefined
+  PROJ_ZEA, // zenithal
+  PROJ_ZPL, // zenithal
+  PROJ_ARC, // zenithal
+  PROJ_STG, // zenithal
+  PROJ_SIN, // zenithal
+  PROJ_TAN, // zenithal
+  PROJ_DIS, // zenithal (TAN + polyterms)
+  PROJ_LIN, // cartesian
+  PROJ_PLY, // cartesian
+  PROJ_WRP, // cartesian
+  PROJ_AIT, // pseudocyl
+  PROJ_GLS, // pseudocyl
+  PROJ_PAR, // pseudocyl
 } OhanaProjection;
 
@@ -294,4 +293,5 @@
 int GetPhotcodeNsecfilt ();
 void SetZeroPoint (double ZP);
+double GetZeroPoint ();
 int *GetPhotcodeEquivList (int code, int *nlist);
 void ParseColorTerms (char *terms, float *X, int *N);
@@ -354,51 +354,9 @@
 int ImageToVtable (VTable *vtable, Header *theader, int format);
 
-Image 		       *ImageElixirToInternal (ImageElixir *in, int Nvalues);
-Image 		       *ImageLoneosToInternal (ImageLoneos *in, int Nvalues);
-Image 		       *ImagePanstarrsToInternal (ImagePanstarrs *in, int Nvalues);
-Image 		       *ImagePanstarrs_DEV_0_ToInternal (ImagePanstarrs_DEV_0 *in, int Nvalues);
-Image 		       *ImagePanstarrs_DEV_1_ToInternal (ImagePanstarrs_DEV_1 *in, int Nvalues);
-
-ImageElixir 	       *ImageInternalToElixir (Image *in, int Nvalues);
-ImageLoneos 	       *ImageInternalToLoneos (Image *in, int Nvalues);
-ImagePanstarrs         *ImageInternalToPanstarrs (Image *in, int Nvalues);
-ImagePanstarrs_DEV_0   *ImageInternalToPanstarrs_DEV_0 (Image *in, int Nvalues);
-ImagePanstarrs_DEV_1   *ImageInternalToPanstarrs_DEV_1 (Image *in, int Nvalues);
-
-Average                *AverageLoneosToInternal (AverageLoneos *in, int Nvalues, SecFilt **primary);
-Average 	       *AverageElixirToInternal (AverageElixir *in, int Nvalues, SecFilt **primary);
-Average 	       *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues);
-Average 	       *AveragePanstarrs_DEV_0_ToInternal (AveragePanstarrs_DEV_0 *in, int Nvalues);
-Average 	       *AveragePanstarrs_DEV_1_ToInternal (AveragePanstarrs_DEV_1 *in, int Nvalues);
-
-AverageLoneos 	       *AverageInternalToLoneos (Average *in, int Nvalues, SecFilt *primary);
-AverageElixir 	       *AverageInternalToElixir (Average *in, int Nvalues, SecFilt *primary);
-AveragePanstarrs       *AverageInternalToPanstarrs (Average *in, int Nvalues);
-AveragePanstarrs_DEV_0 *AverageInternalToPanstarrs_DEV_0 (Average *in, int Nvalues);
-AveragePanstarrs_DEV_1 *AverageInternalToPanstarrs_DEV_1 (Average *in, int Nvalues);
-
-Measure                *MeasureLoneosToInternal (MeasureLoneos *in, int Nvalues);
-Measure 	       *MeasureElixirToInternal (MeasureElixir *in, int Nvalues);
-Measure 	       *MeasurePanstarrsToInternal (MeasurePanstarrs *in, int Nvalues);
-Measure 	       *MeasurePanstarrs_DEV_0_ToInternal (MeasurePanstarrs_DEV_0 *in, int Nvalues);
-Measure 	       *MeasurePanstarrs_DEV_1_ToInternal (MeasurePanstarrs_DEV_1 *in, int Nvalues);
-
-MeasureLoneos 	       *MeasureInternalToLoneos (Measure *in, int Nvalues);
-MeasureElixir 	       *MeasureInternalToElixir (Measure *in, int Nvalues);
-MeasurePanstarrs       *MeasureInternalToPanstarrs (Measure *in, int Nvalues);
-MeasurePanstarrs_DEV_0 *MeasureInternalToPanstarrs_DEV_0 (Measure *in, int Nvalues);
-MeasurePanstarrs_DEV_1 *MeasureInternalToPanstarrs_DEV_1 (Measure *in, int Nvalues);
-
-SecFilt 	       *SecFiltLoneosToInternal (SecFiltLoneos *in, int Nvalues);
-SecFilt 	       *SecFiltElixirToInternal (SecFiltElixir *in, int Nvalues);
-SecFilt 	       *SecFiltPanstarrsToInternal (SecFiltPanstarrs *in, int Nvalues);
-SecFilt 	       *SecFiltPanstarrs_DEV_0_ToInternal (SecFiltPanstarrs_DEV_0 *in, int Nvalues);
-SecFilt 	       *SecFiltPanstarrs_DEV_1_ToInternal (SecFiltPanstarrs_DEV_1 *in, int Nvalues);
-
-SecFiltLoneos 	       *SecFiltInternalToLoneos (SecFilt *in, int Nvalues);
-SecFiltElixir 	       *SecFiltInternalToElixir (SecFilt *in, int Nvalues);
-SecFiltPanstarrs       *SecFiltInternalToPanstarrs (SecFilt *in, int Nvalues);
-SecFiltPanstarrs_DEV_0 *SecFiltInternalToPanstarrs_DEV_0 (SecFilt *in, int Nvalues);
-SecFiltPanstarrs_DEV_1 *SecFiltInternalToPanstarrs_DEV_1 (SecFilt *in, int Nvalues);
+# include "loneos_defs.h"
+# include "elixir_defs.h"
+# include "panstarrs_dev_0_defs.h"
+# include "panstarrs_dev_1_defs.h"
+# include "ps1_dev_1_defs.h"
 
 /*** DVO image db I/O Functions ***/