Changeset 24974

Timestamp:

Aug 2, 2009, 4:27:43 PM (17 years ago)

Author:

eugene

Message:

provide hook to M_ap

Location:

trunk/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/dvo_photcode_ops.c (modified) (1 diff)
• opihi/dvo/dbExtractMeasures.c (modified) (1 diff)
• opihi/dvo/dbFields.c (modified) (1 diff)
• opihi/include/dvoshell.h (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -311 +311 @@
 float PhotInst (Measure *measure);
 float PhotCat (Measure *measure);
+float PhotAper (Measure *measure);
 float PhotSys (Measure *measure, Average *average, SecFilt *secfilt);
 float PhotRel (Measure *measure, Average *average, SecFilt *secfilt);

trunk/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -249 +249 @@
   code = &photcodes[0].code[Np];
   Mcat = measure[0].M - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
+  
+  return (Mcat);
+}
+
+float PhotAper (Measure *measure) {
+
+  int Np;
+  float Mcat;
+  PhotCode *code;
+
+  Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+
+  if (photcodes[0].code[Np].type == PHOT_REF) {
+    Mcat = measure[0].Map;
+    return (Mcat);
+  }
+  code = &photcodes[0].code[Np];
+  Mcat = measure[0].Map - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
   
   return (Mcat);

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

@@ -117 +117 @@
         case MAG_REF:
           value.Flt = PhotRef  (equiv, average, secfilt, measure); 
+          break;
+        case MAG_APER:
+          value.Flt = PhotAper  (measure); 
           break;
         case MAG_ERR:

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

@@ -37 +37 @@
   if (!strcasecmp (string, "ave"))       return (MAG_AVE);
   if (!strcasecmp (string, "ref"))       return (MAG_REF);
+  if (!strcasecmp (string, "ap"))        return (MAG_APER);
+  if (!strcasecmp (string, "aper"))      return (MAG_APER);
   if (!strcasecmp (string, "err"))       return (MAG_ERR);
   if (!strcasecmp (string, "photflags")) return (MAG_PHOT_FLAGS);

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

@@ -27 +27 @@
       MAG_INST, 
       MAG_CAT, 
+      MAG_APER, 
       MAG_SYS, 
       MAG_REL,