Changeset 14379

Timestamp:

Jul 25, 2007, 11:10:16 AM (19 years ago)

Author:

eugene

Message:

adding more fields

Location:

trunk/Ohana/src/opihi

Files:

• dvo/dbExtractMeasures.c (modified) (3 diffs)
• dvo/dbFields.c (modified) (3 diffs)
• dvo/mextract.c (modified) (3 diffs)
• include/dvoshell.h (modified) (1 diff)

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

@@ -23 +23 @@
   switch (field->ID) {
     case MEAS_MAG: /* magnitudes are already determined above */
-      // if user has requested a photcode, supply the value only if we match (else NO_MAG)
-      if ((field->photcode->type != PHOT_MAG) && 
-          (measure[0].photcode != field->photcode->code)) {
-          break;
-      }
+      // we return the magnitude for this measure if:
+      if (field->photcode->type == PHOT_MAG) goto valid_photcode;
+      if ((field->photcode->type == PHOT_REF) && (measure[0].photcode == field->photcode->code)) goto valid_photcode;
+      if ((field->photcode->type == PHOT_DEP) && (measure[0].photcode == field->photcode->code)) goto valid_photcode;
+      if ((field->photcode->type == PHOT_SEC) && (GetPhotcodeEquivbyCode (measure[0].photcode) == field->photcode->code)) goto valid_photcode;
+      break;
+
+  valid_photcode:
       switch (field->magMode) {
         case MAG_INST:
@@ -58 +61 @@
       value = average[0].D - measure[0].dD / 3600.0;
       break;
+    case MEAS_RA_AVE: /* OK */
+      value = average[0].R;
+      break;
+    case MEAS_DEC_AVE: /* OK */
+      value = average[0].D;
+      break;
     case MEAS_dMAG: /* OK */
       value = measure[0].dM;
@@ -73 +82 @@
       value = TimeValue (measure[0].t, TimeReference, TimeFormat);
       break;
+    // note that these represent the ra displacement relative to the average, not 
+    // the error.
     case MEAS_dR: /* OK */
       value = measure[0].dR;

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

@@ -81 +81 @@
     if (useDefault) {
       *mode = MAG_REL;
-    } else {
-      if ((*mode == MAG_AVE) || (*mode == MAG_REF)) {
-        // XXX error;
-        *mode = MAG_REL;
-      }
     }
   } 
@@ -108 +103 @@
   if (!strcasecmp (fieldName, "RA"))       ESCAPE (MEAS_RA,       MAG_NONE);
   if (!strcasecmp (fieldName, "DEC"))      ESCAPE (MEAS_DEC,      MAG_NONE);
-  // if (!strcasecmp (fieldName, "MAG"))      ESCAPE (MEAS_MAG,           MAG_REL);
-  // if (!strcasecmp (fieldName, "dMAG"))     ESCAPE (MEAS_dMAG,          MAG_ERR);
+  if (!strcasecmp (fieldName, "RA:AVE"))   ESCAPE (MEAS_RA_AVE,   MAG_NONE);
+  if (!strcasecmp (fieldName, "DEC:AVE"))  ESCAPE (MEAS_DEC_AVE,  MAG_NONE);
   if (!strcasecmp (fieldName, "AIRMASS"))  ESCAPE (MEAS_AIRMASS,  MAG_NONE);
   if (!strcasecmp (fieldName, "EXPTIME"))  ESCAPE (MEAS_EXPTIME,  MAG_NONE);
@@ -159 +154 @@
   if (!strcasecmp (fieldName, "PAR"))   ESCAPE (AVE_PAR,       MAG_NONE);
   if (!strcasecmp (fieldName, "dPAR"))  ESCAPE (AVE_PAR_ERR,   MAG_NONE);
-  // if (!strcasecmp (fieldName, "MAG"))   ESCAPE (AVE_MAG,       MAG_AVE);
-  // if (!strcasecmp (fieldName, "dMAG"))  ESCAPE (AVE_dMAG,      MAG_ERR);
   if (!strcasecmp (fieldName, "NMEAS")) ESCAPE (AVE_NMEAS,     MAG_NONE);
   if (!strcasecmp (fieldName, "NMISS")) ESCAPE (AVE_NMISS,     MAG_NONE);

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

@@ -116 +116 @@
     for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
       m = catalog.average[j].offset;
-      for (k = 0; k < catalog.average[j].Nm; k++, m++) {
+      for (k = 0; (k < catalog.average[j].Nm); k++, m++) {
 
         // extract the relevant values for this measurement
@@ -122 +122 @@
           values[n] = dbExtractMeasures (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
         }
+        // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);
         
         // test the conditional statement
@@ -127 +128 @@
         for (n = 0; n < Nreturn; n++) {
           vec[n][0].elements[Npts] = values[n];
+          // fprintf (stderr, "keep : field: %s, value: %f\n", fields[n].name, values[n]);
         }
         Npts++;

trunk/Ohana/src/opihi/include/dvoshell.h

@@ -12 +12 @@
 enum {MEAS_ZERO, MEAS_RA, MEAS_DEC, MEAS_MAG, MEAS_dMAG, MEAS_MINST, MEAS_MCAT, 
       MEAS_MSYS, MEAS_MREL, MEAS_MCAL, MEAS_PHOTCODE, MEAS_TIME, MEAS_dR, MEAS_dD, 
-      MEAS_FWHM, MEAS_DOPHOT, MEAS_XCCD, MEAS_YCCD, MEAS_XMOSAIC, MEAS_YMOSAIC, MEAS_FLAGS, MEAS_EXPTIME, MEAS_AIRMASS};
+      MEAS_FWHM, MEAS_DOPHOT, MEAS_XCCD, MEAS_YCCD, MEAS_XMOSAIC, MEAS_YMOSAIC, 
+      MEAS_FLAGS, MEAS_EXPTIME, MEAS_AIRMASS, MEAS_RA_AVE, MEAS_DEC_AVE};
 
 /* average fields */