Changeset 39670

Timestamp:

Sep 4, 2016, 10:38:02 AM (10 years ago)

Author:

eugene

Message:

add accessors for flux:sys:err and flux:rel:err

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dbExtractMeasures.c (modified) (1 diff)
• src/dvo_photcode_ops.c (modified) (1 diff)

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

@@ -921 +921 @@
 float PhotFluxCatErr (Measure *measure, dvoMagClassType class);
 float PhotFluxAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source);
+float PhotFluxSysErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class);
+float PhotFluxRelErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class);
 
 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt);

trunk/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -228 +228 @@
               break;
             case MAG_LEVEL_SYS:
+              value.Flt = PhotFluxSysErr (measure, average, secfilt, field->magClass); 
+              break;
             case MAG_LEVEL_REL:
+              value.Flt = PhotFluxRelErr (measure, average, secfilt, field->magClass); 
+              break;
             case MAG_LEVEL_CAL:
-              // value.Flt = PhotFluxErr (measure, field->magClass);  
+              // XXX not defined
               break;
             case MAG_LEVEL_AVE:
+              value.Flt = PhotFluxAveErr (equiv, average, secfilt, field->magClass, field->magSource);  
+              break;
             case MAG_LEVEL_REF:
-              // value.Flt = PhotFluxAveErr (equiv, average, secfilt, field->magClass, field->magSource);  
+              // XXX not defined
               break;
             case MAG_LEVEL_NONE:

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

@@ -1507 +1507 @@
   }
   return (dFcat);
+}
+
+float PhotFluxSysErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) {
+
+  int Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+  PhotCode *code = &photcodes[0].code[Np];
+
+  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
+  float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
+  float Moff = Mcal - ZERO_POINT + 8.9;
+  float Foff = 3630.8 * MagToFlux(Mcal);
+
+  // use dFlux if we can, but use dMag if we must:
+  // dFlux = Flux * dMag
+
+  float dFcat = NAN;
+  switch (class) {
+    case MAG_CLASS_PSF:
+      if (isnan (measure[0].dFluxPSF)) {
+        float Finst = MagToFlux(measure[0].M + Moff);
+        dFcat = measure[0].dM * Finst;
+      } else {
+        dFcat = measure[0].dFluxPSF * Foff;
+      }
+      break;
+    case MAG_CLASS_KRON:
+      if (isnan (measure[0].dFluxKron)) {
+        float Finst = MagToFlux(measure[0].Mkron + Moff);
+        dFcat = measure[0].dMkron * Finst;
+      } else {
+        dFcat = measure[0].dFluxKron * Foff;
+      }
+      break;
+    case MAG_CLASS_APER:
+      if (isnan (measure[0].dFluxAp)) {
+        float Finst = MagToFlux(measure[0].Map + Moff);
+        dFcat = measure[0].dMap * Finst;
+      } else {
+        dFcat = measure[0].dFluxAp * Foff;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* color correction */
+  float mc = PhotColorForCode (average, secfilt, NULL, code);
+  if (isnan(mc)) return (dFcat);
+  mc -= SCALE*code[0].dX;
+
+  double Mc = mc;
+  float Mcol = 0;
+  int i = 0;
+  for (i = 0; i < code[0].Nc; i++) {
+    Mcol += code[0].X[i]*Mc;
+    Mc *= mc;
+  }
+  float Fcol = MagToFlux (Mcol);
+
+  float dFsys = dFcat * Fcol;
+
+  return (dFsys);
+}
+
+float PhotFluxRelErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) {
+
+  int Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+  PhotCode *code = &photcodes[0].code[Np];
+
+  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
+  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
+  float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
+  float Moff = Mcal - ZERO_POINT + 8.9;
+  float Foff = 3630.8 * MagToFlux(Mcal);
+
+  // use dFlux if we can, but use dMag if we must:
+  // dFlux = Flux * dMag
+
+  float dFcat = NAN;
+  switch (class) {
+    case MAG_CLASS_PSF:
+      if (isnan (measure[0].dFluxPSF)) {
+        float Finst = MagToFlux(measure[0].M + Moff);
+        dFcat = measure[0].dM * Finst;
+      } else {
+        dFcat = measure[0].dFluxPSF * Foff;
+      }
+      break;
+    case MAG_CLASS_KRON:
+      if (isnan (measure[0].dFluxKron)) {
+        float Finst = MagToFlux(measure[0].Mkron + Moff);
+        dFcat = measure[0].dMkron * Finst;
+      } else {
+        dFcat = measure[0].dFluxKron * Foff;
+      }
+      break;
+    case MAG_CLASS_APER:
+      if (isnan (measure[0].dFluxAp)) {
+        float Finst = MagToFlux(measure[0].Map + Moff);
+        dFcat = measure[0].dMap * Finst;
+      } else {
+        dFcat = measure[0].dFluxAp * Foff;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* color correction */
+  float mc = PhotColorForCode (average, secfilt, NULL, code);
+  if (isnan(mc)) return (dFcat);
+  mc -= SCALE*code[0].dX;
+
+  double Mc = mc;
+  float Mcol = 0;
+  int i = 0;
+  for (i = 0; i < code[0].Nc; i++) {
+    Mcol += code[0].X[i]*Mc;
+    Mc *= mc;
+  }
+  float Fcol = MagToFlux (Mcol);
+
+  float dFrel = dFcat * Fcol;
+
+  return (dFrel);
 }