Changeset 17199 for trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

Timestamp:

Mar 28, 2008, 3:33:54 PM (18 years ago)

Author:

eugene

Message:

add field to return distance from model fits

File:

• trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c (modified) (5 diffs)

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

@@ -10 +10 @@
 static int TimeFormat;
 
+static time_t TimeRefPM;
+
 static CoordTransform *celestial_to_galactic = NULL;
 static CoordTransform *celestial_to_ecliptic = NULL;
@@ -30 +32 @@
 
 void dbExtractMeasuresInit () {
+  TimeRefPM = ohana_date_to_sec ("2000/01/01");
   GetTimeFormat (&TimeReference, &TimeFormat);
 }
@@ -71 +74 @@
   int Nsec;
   double value;
-  double ra, dec, x, y;
+  double ra, dec, x, y, dT;
 
   Image *image;
@@ -111 +114 @@
           break;
         case MAG_ERR:
-          value = PhotdM  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt); 
+          if (field->photcode->type == PHOT_SEC) {
+            value = PhotdM  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt); 
+          } else {
+            value = measure[0].dM;
+          }
           break;
         case MAG_CHISQ:
@@ -242 +249 @@
     case MEAS_DEC_OFFSET: /* OK */
       value = measure[0].dD;
+      break;
+    case MEAS_RA_FIT_OFFSET: /* OK */
+      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
+      value = average[0].uR * dT + measure[0].dR;
+      break;
+    case MEAS_DEC_FIT_OFFSET: /* OK */
+      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
+      value = average[0].uD * dT + measure[0].dD;
       break;
     case MEAS_RA_OFFSET_ERR: /* OK */