Changeset 27838 for branches/tap_branches/Ohana/src/opihi/dvo/dbExtractAverages.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/dbExtractAverages.c (modified) (5 diffs)

branches/tap_branches/Ohana/src/opihi/dvo/dbExtractAverages.c

@@ -1 +1 @@
 # include "dvoshell.h"
+
+/* time concepts */
+static time_t TimeReference;
+static int TimeFormat;
 
 static CoordTransform *celestial_to_galactic = NULL;
@@ -34 +38 @@
 
 int dbExtractAveragesInit () {
+  GetTimeFormat (&TimeReference, &TimeFormat);
   haveGalactic = FALSE;
   haveEcliptic = FALSE;
@@ -42 +47 @@
 dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
 
-  int i, Nsec;
+  off_t i;
+  int Nsec;
   dbValue value;
 
@@ -117 +123 @@
       value.Int = average[0].Nmissing;
       break;
+    case AVE_NPOS:
+      value.Int = average[0].Npos;
+      break;
+
+    case AVE_CHISQ_POS:
+      value.Flt = average[0].ChiSqAve;
+      break;
+    case AVE_CHISQ_PM:
+      value.Flt = average[0].ChiSqPM;
+      break;
+    case AVE_CHISQ_PAR:
+      value.Flt = average[0].ChiSqPar;
+      break;
+
+    case AVE_TMEAN:
+      value.Flt = TimeValue (average[0].Tmean, TimeReference, TimeFormat);
+      break;
+    case AVE_TRANGE:
+      value.Flt = TimeValue (average[0].Trange, 0, TimeFormat);
+      break;
+
     case AVE_Xp:
       value.Flt = 0.01*average[0].Xp;
       break;
-    case AVE_FLAG:
+
+    case AVE_OBJ_FLAGS:
       value.Int = average[0].flags;
       break;
@@ -128 +156 @@
     case AVE_CATID:
       value.Int = average[0].catID;
+      break;
+    case AVE_EXTID_HI:
+      value.Int = (0x00000000FFFFFFFF & (average[0].extID >> 32));
+      break;
+    case AVE_EXTID_LO:
+      value.Int = (0x00000000FFFFFFFF & average[0].extID);
       break;