Changeset 26285

Timestamp:

Nov 27, 2009, 1:08:36 PM (16 years ago)

Author:

eugene

Message:

split out photcode:err vs photcode:aveerr for mextract

Location:

trunk/Ohana/src/opihi

Files:

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

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

@@ -122 +122 @@
           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:

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

@@ -40 +40 @@
   if (!strcasecmp (string, "aper"))      return (MAG_APER);
   if (!strcasecmp (string, "err"))       return (MAG_ERR);
+  if (!strcasecmp (string, "aveerr"))    return (MAG_AVE_ERR);
   if (!strcasecmp (string, "photflags")) return (MAG_PHOT_FLAGS);
   if (!strcasecmp (string, "chisq"))     return (MAG_CHISQ);

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

@@ -225 +225 @@
     gprint (GP_ERR, "  <photcode>:rel :  relative magnitude for photcode\n");
     gprint (GP_ERR, "  <photcode>:cal :  calibrated magnitude for photcode \n");
-    gprint (GP_ERR, "  <photcode>:err : magnitude error for photcode\n");
+    gprint (GP_ERR, "  <photcode>:err :  magnitude error for measurement\n");
+    gprint (GP_ERR, "  <photcode>:aveerr : average error (stdev)\n");
     gprint (GP_ERR, "  <photcode>:chisq : raw chi-square of magnitude fit\n");
     gprint (GP_ERR, "  <photcode>:ncode : number of measurements in photcode\n");

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

@@ -34 +34 @@
       MAG_REF, 
       MAG_ERR, 
+      MAG_AVE_ERR, 
       MAG_PHOT_FLAGS, 
       MAG_CHISQ,