Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/libdvo/src/dbExtractMeasures.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/libdvo/src/dbExtractMeasures.c (modified) (6 diffs)

branches/meh_branches/ppstack_test/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -277 +277 @@
       value.Int = average[0].flags;
       break;
+    case MEAS_SECFILT_FLAGS: /* OK */
+      equiv = GetPhotcodeEquivbyCode (measure[0].photcode);
+      Nsec = GetPhotcodeNsec (equiv->code);
+      if (Nsec == -1) break;
+      value.Int = secfilt[Nsec].flags;
+      break;
+
     // note that these represent the ra displacement relative to the average, not 
     // the error.
@@ -302 +309 @@
       value.Flt = measure[0].airmass;
       break;
+    case MEAS_MEAN_AIRMASS: /* OK */
+      {
+        Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        value.Flt = image[0].secz;
+        break;
+      }
     case MEAS_AZ: /* OK */
       value.Flt = measure[0].az;
@@ -317 +331 @@
       value.Int = measure[0].photcode;
       break;
+    case MEAS_PHOTCODE_KLAM: /* OK */
+      { 
+        PhotCode *code = GetPhotcodebyCode (measure[0].photcode);
+        if (!code) break;
+        value.Flt = code->K;
+        break;
+      }
+    case MEAS_PHOTCODE_C: /* OK */
+      { 
+        PhotCode *code = GetPhotcodebyCode (measure[0].photcode);
+        if (!code) break;
+        value.Flt = code->C;
+        break;
+      }
     case MEAS_TIME: /* OK */
       value.Flt = TimeValue (measure[0].t, TimeReference, TimeFormat);
@@ -351 +379 @@
       break;
     case MEAS_XCCD: /* OK */
-/* I need to perform this conversion for ELIXIR and LONEOS formats on load */      
-# if 1
+# if MEASURE_HAS_XCCD
       value.Flt = measure[0].Xccd;
 # else
       { 
+        // I'm keeping this code because it gives a way of handing dvo dbs that don't have
+        // measure.xccd if we need it
         Image *image;
         ra  = average[0].R - measure[0].dR / 3600.0;
@@ -367 +396 @@
       break;
     case MEAS_YCCD: /* OK */
-/* I need to perform this conversion for ELIXIR and LONEOS formats on load */      
-# if 1
+# if MEASURE_HAS_XCCD
       value.Flt = measure[0].Yccd;
 # else
@@ -456 +484 @@
       break;
 
+    case MEAS_MCAL_OFFSET: /* OK */
+      value.Flt = measure[0].Mcal;
+      break;
+
+    case MEAS_FLAT: /* OK */
+      // flat = measure.Mcal - image.Mcal
+      { 
+        Image *image;
+        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        value.Flt = measure[0].Mcal - image[0].Mcal;
+      }
+      break;
+
       // add the star/galaxy sep -- 
   }