Changeset 16936 for trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

Timestamp:

Mar 11, 2008, 11:11:55 AM (18 years ago)

Author:

eugene

Message:

add galactic and ecliptic longitude and latitude as virtual fields

File:

• trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

@@ -1 +1 @@
 # include "dvoshell.h"
+
+static CoordTransform *celestial_to_galactic = NULL;
+static CoordTransform *celestial_to_ecliptic = NULL;
+
+static int haveGalactic = FALSE;
+static double GLON = 0.0;
+static double GLAT = 0.0;
+
+static int haveEcliptic = FALSE;
+static double ELON = 0.0;
+static double ELAT = 0.0;
+
+// define a locally-static transform
+int dbExtractAveragesInitTransform (CoordTransformSystem target) {
+
+  // galactic transform is kept forever
+  if (target == COORD_GALACTIC) {
+    if (celestial_to_galactic != NULL) return (TRUE);
+    celestial_to_galactic = InitTransform (COORD_CELESTIAL, target);
+    return (TRUE);
+  }
+
+  // ecliptic transform must be updated (is weakly time-dependent)
+  if (target == COORD_ECLIPTIC) {
+    if (celestial_to_ecliptic != NULL) {
+      free (celestial_to_ecliptic);
+    }
+    celestial_to_ecliptic = InitTransform (COORD_CELESTIAL, target);
+    return (TRUE);
+  }
+  return (FALSE);
+}
+
+int dbExtractAveragesInit () {
+  haveGalactic = FALSE;
+  haveEcliptic = FALSE;
+  return (TRUE);
+}
 
 /* return average.field based on the selection */
@@ -16 +54 @@
     case AVE_DEC:
       value = average[0].D;
+      break;
+    case AVE_GLON:
+      if (!haveGalactic) {
+        ApplyTransform (&GLON, &GLAT, average[0].R, average[0].D, celestial_to_galactic);
+        haveGalactic = TRUE;
+      }
+      value = GLON;
+      break;
+    case AVE_GLAT:
+      if (!haveGalactic) {
+        ApplyTransform (&GLON, &GLAT, average[0].R, average[0].D, celestial_to_galactic);
+        haveGalactic = TRUE;
+      }
+      value = GLAT;
+      break;
+    case AVE_ELON:
+      if (!haveEcliptic) {
+        ApplyTransform (&ELON, &ELAT, average[0].R, average[0].D, celestial_to_ecliptic);
+        haveEcliptic = TRUE;
+      }
+      value = ELON;
+      break;
+    case AVE_ELAT:
+      if (!haveEcliptic) {
+        ApplyTransform (&ELON, &ELAT, average[0].R, average[0].D, celestial_to_ecliptic);
+        haveEcliptic = TRUE;
+      }
+      value = ELAT;
       break;
     case AVE_RA_ERR: