Changeset 40755 for branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_fitprofile.c

Timestamp:

May 27, 2019, 8:42:23 AM (7 years ago)

Author:

eugene

Message:

coding trace analysis to handle bad edge cases; add red & blu sides for trace spline; adding variance to flat-field

File:

• branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_fitprofile.c (modified) (2 diffs)

branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_fitprofile.c

@@ -78 +78 @@
   
   float Sky_V = 0.0, BckL_V = 0.0, BckR_V = 0.0;
-  int Sky_N = 0, BckL_N = 0, BckR_N = 0;
+  float Sky_N = 0.0, BckL_N = 0.0, BckR_N = 0.0;
   for (int i = 0; i < xprofile->Nelements; i++) {
+    if (!isfinite(wprofile->elements.Flt[i])) continue;
+    if (!isfinite(fprofile->elements.Flt[i])) continue;
+    float wt = 1 / SQ(wprofile->elements.Flt[i]);
     if (xprofile->elements.Flt[i] < Xs) {
-      BckL_V += fprofile->elements.Flt[i];
-      BckL_N ++;
+      BckL_V += fprofile->elements.Flt[i]*wt;
+      BckL_N += wt;
       continue;
     }
     if (xprofile->elements.Flt[i] > Xe) {
-      BckR_V += fprofile->elements.Flt[i];
-      BckR_N ++;
+      BckR_V += fprofile->elements.Flt[i]*wt;
+      BckR_N += wt;
       continue;
     }
-    Sky_V += fprofile->elements.Flt[i];
-    Sky_N ++;
+    Sky_V += fprofile->elements.Flt[i]*wt;
+    Sky_N += wt;
   }
   float Sky = Sky_V / Sky_N;
@@ -211 +214 @@
   int Npts = 0;
   for (int i = 0; i < NptsAll; i++) {
+    if (!isfinite(wprofile[i])) continue;
+    if (!isfinite(fprofile[i])) continue;
     int keep = (mode == MODE_UPPER) ^ (xprofile[i] < limit);
     if (keep) {