Changeset 27839 for branches/simmosaic_branches/Ohana/src/opihi/dvo/dbExtractMeasures.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/dbExtractMeasures.c (modified) (10 diffs)

branches/simmosaic_branches/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;
@@ -32 +30 @@
 
 int dbExtractMeasuresInit () {
-  TimeRefPM = ohana_date_to_sec ("2000/01/01");
   GetTimeFormat (&TimeReference, &TimeFormat);
   return (TRUE);
@@ -118 +115 @@
           value.Flt = PhotRef  (equiv, average, secfilt, measure); 
           break;
+        case MAG_APER:
+          value.Flt = PhotAper  (measure); 
+          break;
         case MAG_ERR:
-          if (field->photcode->type == PHOT_SEC) {
-            value.Flt = PhotdM  (equiv, average, secfilt); 
-          } else {
-            value.Flt = measure[0].dM;
-          }
+          value.Flt = measure[0].dM;
+          break;
+        case MAG_AVE_ERR:
+          value.Flt = PhotdM  (equiv, average, secfilt); 
           break;
         case MAG_PHOT_FLAGS:
@@ -250 +249 @@
       value.Flt = average[0].D;
       break;
-    case MEAS_XP: /* OK */
-      value.Flt = average[0].Xp;
+    case MEAS_CHISQ_POS: /* OK */
+      value.Flt = average[0].ChiSqAve;
+      break;
+    case MEAS_CHISQ_PM: /* OK */
+      value.Flt = average[0].ChiSqPM;
+      break;
+    case MEAS_CHISQ_PAR: /* OK */
+      value.Flt = average[0].ChiSqPar;
+      break;
+    case MEAS_TMEAN: /* OK */
+      value.Flt = TimeValue (average[0].Tmean, TimeReference, TimeFormat);
+      break;
+    case MEAS_TRANGE: /* OK */
+      value.Flt = TimeValue (average[0].Trange, 0, TimeFormat);
       break;
     case MEAS_NMEAS: /* OK */
@@ -259 +270 @@
       value.Int = average[0].Nmissing;
       break;
-    case MEAS_OBJFLAGS: /* OK */
+    case MEAS_NPOS: /* OK */
+      value.Int = average[0].Npos;
+      break;
+    case MEAS_OBJ_FLAGS: /* OK */
       value.Int = average[0].flags;
       break;
@@ -271 +285 @@
       break;
     case MEAS_RA_FIT_OFFSET: /* OK */
-      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
+      dT = (measure[0].t - average[0].Tmean) / (86400*365.25);
       value.Flt = average[0].uR * dT + measure[0].dR;
       break;
     case MEAS_DEC_FIT_OFFSET: /* OK */
-      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
+      dT = (measure[0].t - average[0].Tmean) / (86400*365.25);
       value.Flt = average[0].uD * dT + measure[0].dD;
       break;
@@ -293 +307 @@
       value.Flt = pow (10.0, measure[0].dt * 0.4);
       break;
+    case MEAS_PHOTCODE_EQUIV: /* OK */
+      value.Int = GetPhotcodeEquivCodebyCode (measure[0].photcode);
+      break;
     case MEAS_PHOTCODE: /* OK */
       value.Int = measure[0].photcode;
@@ -310 +327 @@
     case MEAS_THETA: /* OK */
       value.Flt = measure[0].theta;
+      break;
+    case MEAS_MXX: /* OK */
+      value.Flt = measure[0].Mxx;
+      break;
+    case MEAS_MXY: /* OK */
+      value.Flt = measure[0].Mxy;
+      break;
+    case MEAS_MYY: /* OK */
+      value.Flt = measure[0].Myy;
       break;
     case MEAS_DOPHOT: /* OK */
@@ -353 +379 @@
       break;
     case MEAS_XCCD_ERR: /* OK */
-      value.Flt = measure[0].dXccd;
+      value.Flt = measure[0].dXccd / 100.0;
       break;
     case MEAS_YCCD_ERR: /* OK */
-      value.Flt = measure[0].dYccd;
+      value.Flt = measure[0].dYccd / 100.0;
       break;
     case MEAS_XMOSAIC: /* OK */
@@ -399 +425 @@
       value.Flt = measure[0].psfChisq;
       break;
+    case MEAS_PSF_NDOF: /* OK */
+      value.Int = measure[0].psfNdof;
+      break;
+    case MEAS_PSF_NPIX: /* OK */
+      value.Int = measure[0].psfNpix;
+      break;
     case MEAS_CR_NSIGMA: /* OK */
       value.Flt = measure[0].crNsigma;