Changeset 15035 for trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

Timestamp:

Sep 26, 2007, 1:29:18 PM (19 years ago)

Author:

eugene

Message:

major cleanup of I/O formats; use macros for simplifications; add PS1_DEV_1 output format

File:

• trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c (modified) (8 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

@@ -2 +2 @@
 
 /* convert panstarrs-format measures to internal measures */
-Measure *MeasurePanstarrs_DEV_1_ToInternal (MeasurePanstarrs_DEV_1 *in, int Nvalues) {
+Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, int Nvalues) {
 
   int i;
@@ -44 +44 @@
 
 /* convert internal measures to panstarrs-format measures */
-MeasurePanstarrs_DEV_1 *MeasureInternalToPanstarrs_DEV_1 (Measure *in, int Nvalues) {
-
-  int i;
-  MeasurePanstarrs_DEV_1 *out;
-
-  ALLOCATE (out, MeasurePanstarrs_DEV_1, Nvalues);
+Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, int Nvalues) {
+
+  int i;
+  Measure_Panstarrs_DEV_1 *out;
+
+  ALLOCATE (out, Measure_Panstarrs_DEV_1, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -86 +86 @@
 
 /* convert panstarrs-format averages to internal averages */
-Average *AveragePanstarrs_DEV_1_ToInternal (AveragePanstarrs_DEV_1 *in, int Nvalues) {
+// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
+Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, int Nvalues, SecFilt **primary) {
 
   int i;
@@ -117 +118 @@
 
 /* convert internal averages to panstarrs-format averages */
-AveragePanstarrs_DEV_1 *AverageInternalToPanstarrs_DEV_1 (Average *in, int Nvalues) {
-
-  int i;
-  AveragePanstarrs_DEV_1 *out;
-
-  ALLOCATE (out, AveragePanstarrs_DEV_1, Nvalues);
+// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
+Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, int Nvalues, SecFilt *primary) {
+
+  int i;
+  Average_Panstarrs_DEV_1 *out;
+
+  ALLOCATE (out, Average_Panstarrs_DEV_1, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -148 +150 @@
 
 /* convert panstarrs-format secfilts to internal secfilts */
-SecFilt *SecFiltPanstarrs_DEV_1_ToInternal (SecFiltPanstarrs_DEV_1 *in, int Nvalues) {
+SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, int Nvalues) {
 
   int i;
@@ -166 +168 @@
 
 /* convert internal secfilts to panstarrs-format secfilts */
-SecFiltPanstarrs_DEV_1 *SecFiltInternalToPanstarrs_DEV_1 (SecFilt *in, int Nvalues) {
-
-  int i;
-  SecFiltPanstarrs_DEV_1 *out;
-
-  ALLOCATE (out, SecFiltPanstarrs_DEV_1, Nvalues);
+SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, int Nvalues) {
+
+  int i;
+  SecFilt_Panstarrs_DEV_1 *out;
+
+  ALLOCATE (out, SecFilt_Panstarrs_DEV_1, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -184 +186 @@
 
 /* convert panstarrs-format images to internal images */
-Image *ImagePanstarrs_DEV_1_ToInternal (ImagePanstarrs_DEV_1 *in, int Nvalues) {
+Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, int Nvalues) {
 
   int i;
@@ -240 +242 @@
 
 /* convert internal images to panstarrs-format images */
-ImagePanstarrs_DEV_1 *ImageInternalToPanstarrs_DEV_1 (Image *in, int Nvalues) {
-
-  int i;
-  ImagePanstarrs_DEV_1 *out;
-
-  ALLOCATE (out, ImagePanstarrs_DEV_1, Nvalues);
+Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, int Nvalues) {
+
+  int i;
+  Image_Panstarrs_DEV_1 *out;
+
+  ALLOCATE (out, Image_Panstarrs_DEV_1, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {