Changeset 12275 for branches/dvo-mods-2007-02/Ohana/src/libdvo/include/dvo.h

Timestamp:

Mar 6, 2007, 8:55:11 AM (19 years ago)

Author:

eugene

Message:

adding PANSTARRS_DEV_0, notes on adding new formats, cleanups to simply adding new formats

File:

• branches/dvo-mods-2007-02/Ohana/src/libdvo/include/dvo.h (modified) (2 diffs)

branches/dvo-mods-2007-02/Ohana/src/libdvo/include/dvo.h

@@ -18 +18 @@
 
 /* DVO table formats */
-enum {DVO_FORMAT_UNDEF, DVO_FORMAT_INTERNAL, DVO_FORMAT_ELIXIR, DVO_FORMAT_LONEOS, DVO_FORMAT_PANSTARRS, DVO_FORMAT_PMTEST} DVOTableFormat;
+enum {DVO_FORMAT_UNDEF, 
+      DVO_FORMAT_INTERNAL, 
+      DVO_FORMAT_ELIXIR, 
+      DVO_FORMAT_LONEOS, 
+      DVO_FORMAT_PANSTARRS, 
+      DVO_FORMAT_PMTEST, 
+      DVO_FORMAT_PANSTARRS_DEV_0
+} DVOTableFormat;
 
 /* image data modes in RegImage */
@@ -339 +346 @@
 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);
-
-ImageElixir      *ImageInternalToElixir (Image *in, int Nvalues);
-ImageLoneos      *ImageInternalToLoneos (Image *in, int Nvalues);
-ImagePanstarrs   *ImageInternalToPanstarrs (Image *in, int Nvalues);
-
-Average          *AverageLoneosToInternal (AverageLoneos *in, int Nvalues, SecFilt **primary);
-Average          *AverageElixirToInternal (AverageElixir *in, int Nvalues, SecFilt **primary);
-Average          *AveragePMtestToInternal (AveragePMtest *in, int Nvalues);
-Average          *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues);
-
-AverageLoneos    *AverageInternalToLoneos (Average *in, int Nvalues, SecFilt *primary);
-AverageElixir    *AverageInternalToElixir (Average *in, int Nvalues, SecFilt *primary);
-AveragePMtest    *AverageInternalToPMtest (Average *in, int Nvalues);
-AveragePanstarrs *AverageInternalToPanstarrs (Average *in, int Nvalues);
-
-Measure          *MeasureLoneosToInternal (MeasureLoneos *in, int Nvalues);
-Measure          *MeasureElixirToInternal (MeasureElixir *in, int Nvalues);
-Measure          *MeasurePanstarrsToInternal (MeasurePanstarrs *in, int Nvalues);
-
-MeasureLoneos    *MeasureInternalToLoneos (Measure *in, int Nvalues);
-MeasureElixir    *MeasureInternalToElixir (Measure *in, int Nvalues);
-MeasurePanstarrs *MeasureInternalToPanstarrs (Measure *in, int Nvalues);
-
-SecFilt          *SecFiltLoneosToInternal (SecFiltLoneos *in, int Nvalues);
-SecFilt          *SecFiltElixirToInternal (SecFiltElixir *in, int Nvalues);
-SecFilt          *SecFiltPanstarrsToInternal (SecFiltPanstarrs *in, int Nvalues);
-
-SecFiltLoneos    *SecFiltInternalToLoneos (SecFilt *in, int Nvalues);
-SecFiltElixir    *SecFiltInternalToElixir (SecFilt *in, int Nvalues);
-SecFiltPanstarrs *SecFiltInternalToPanstarrs (SecFilt *in, int Nvalues);
+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);
+
+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);
+
+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);
+
+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);
+
+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);
+
+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);
+
+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);
+
+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);
 
 /*** DVO image db I/O Functions ***/