Changeset 41891 for trunk/Ohana/src/opihi/cmd.data/medimage_calc.c

Timestamp:

Nov 4, 2021, 6:02:11 PM (5 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-dev-20210817 (add chebyshev, add fit2d_full, add inner_fraction to medimage, change dvoImageOverlap test to CERSTD)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data/medimage_calc.c (modified) (5 diffs)

trunk/Ohana/src/opihi/cmd.data/medimage_calc.c

@@ -19 +19 @@
 static float *irls_testval = NULL;
 
-enum {CALC_MEDIAN, CALC_MEAN, CALC_IRLS, CALC_WTMEAN};
+enum {CALC_MEDIAN, CALC_MEAN, CALC_IRLS, CALC_WTMEAN, CALC_INNER_FRACTION};
 
 int medimage_calc (int argc, char **argv) {
@@ -39 +39 @@
   }
 
+  float minRange = NAN;
+  float maxRange = NAN;
+
   int mode = CALC_MEDIAN;
   if ((N = get_argument (argc, argv, "-mean"))) {
@@ -45 +48 @@
   }
   if ((N = get_argument (argc, argv, "-irls"))) {
-    if (mode != CALC_MEDIAN) { gprint (GP_ERR, "supply only one of -mean, -median, -irls, -wtmean\n"); return FALSE; }
+    if (mode != CALC_MEDIAN) goto choose_one;
     mode = CALC_IRLS;
     remove_argument (N, &argc, argv);
   }
   if ((N = get_argument (argc, argv, "-wtmean"))) {
-    if (mode != CALC_MEDIAN) { gprint (GP_ERR, "supply only one of -mean, -median, -irls, -wtmean\n"); return FALSE; }
+    if (mode != CALC_MEDIAN) goto choose_one;
     mode = CALC_WTMEAN;
     remove_argument (N, &argc, argv);
   }
+  if ((N = get_argument (argc, argv, "-inner-fraction"))) {
+    if (mode != CALC_MEDIAN) goto choose_one;
+    if (argc < N + 3) goto fraction_options;
+    mode = CALC_INNER_FRACTION;
+    remove_argument (N, &argc, argv);
+    minRange = atof(argv[N]);
+    if ((minRange < 0.0) || (minRange > 1.0)) goto fraction_options;
+    remove_argument (N, &argc, argv);
+    maxRange = atof(argv[N]);
+    if ((maxRange < 0.0) || (maxRange > 1.0)) goto fraction_options;
+    if (maxRange <= minRange) goto fraction_options;
+    remove_argument (N, &argc, argv);
+  }
   if ((N = get_argument (argc, argv, "-median"))) {
-    if (mode != CALC_MEDIAN) { gprint (GP_ERR, "supply only one of -mean, -median, -irls, -wtmean\n"); return FALSE; }
+    if (mode != CALC_MEDIAN) goto choose_one;
     mode = CALC_MEDIAN;
     remove_argument (N, &argc, argv);
@@ -157 +173 @@
           }
           break;
+        case CALC_INNER_FRACTION:
+          fsort (val, N);
+          int Ns = MIN(MAX(0, minRange * N),N); // e.g., 0.1 * 50 = 5
+          int Ne = MIN(MAX(0, maxRange * N),N); // e.g., 0.9 * 50 = 45 
+          int Npt = Ne - Ns;
+
+          float sum = 0.0;
+          for (n = Ns; n < Ne; n++) {
+            sum += val[n];
+          }
+          outvalue[Npix] = sum / (float) Npt;
+
+          if (varvalue) {
+            float sum = 0.0;
+            for (n = Ns; n < Ne; n++) {
+              sum += SQ(val[n] - outvalue[Npix]);
+            }
+            // variance on the mean (stdev / sqrt(N))^2
+            varvalue[Npix] = sum / (Npt - 1) / Npt;
+          }
+          break;
         case CALC_MEAN: {
           float sum = 0.0;
@@ -195 +232 @@
   irls_free();
   return TRUE;
+
+ choose_one:
+  gprint (GP_ERR, "supply only one of -mean, -median, -irls, -wtmean, -inner-fraction\n");
+  return FALSE; 
+
+ fraction_options:
+  gprint (GP_ERR, "USE: -inner-fraction (min) (max) : min & max in range 0.0 to 1.0\n");
+  return FALSE; 
 }