Changeset 35126

Timestamp:

Feb 7, 2013, 2:34:19 PM (13 years ago)

Author:

eugene

Message:

add expname selection to mextract

Location:

branches/eam_branches/ipp-20130207/Ohana/src/libdvo

Files:

• include/dvodb.h (modified) (1 diff)
• src/dbExtractMeasures.c (modified) (1 diff)
• src/dbFields.c (modified) (1 diff)

branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/dvodb.h

@@ -141 +141 @@
       MEAS_EXT_NSIGMA, 
       MEAS_EXTERN_ID,
+      MEAS_EXPNAME_AS_INT,
       MEAS_MCAL_OFFSET,
       MEAS_FLAT,

branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -523 +523 @@
       break;
 
+    case MEAS_EXPNAME_AS_INT:
+      {
+        Image *image;
+        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        // XXX very crude: if this matches oNNNNgNNNNo, then convert to an int
+        // otherwise, leave as 0
+        if ((image->name[0] == 'o') && (image->name[5] == 'g') && (image->name[10] == 'o')) {
+          int mjd  = atoi(&image->name[1]);
+          int Nexp = atoi(&image->name[6]);
+          value.Int = mjd * 10000 + Nexp;
+        }
+      }
+      break;
+
     case MEAS_MCAL_OFFSET: /* OK */
       value.Flt = measure[0].Mcal;

branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dbFields.c

@@ -231 +231 @@
   if (!strcasecmp (fieldName, "IMAGEID"))        ESCAPE (MEAS_IMAGE_ID,       MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "EXTERNID"))       ESCAPE (MEAS_EXTERN_ID,      MAG_NONE, OPIHI_INT);
+  if (!strcasecmp (fieldName, "EXPNAME"))        ESCAPE (MEAS_EXPNAME_AS_INT, MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "PSF_QF"))         ESCAPE (MEAS_PSF_QF,         MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "PSF_QF_PERFECT")) ESCAPE (MEAS_PSF_QF_PERFECT, MAG_NONE, OPIHI_FLT);