Changeset 42361 for branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/threshold.c

Timestamp:

Feb 4, 2023, 7:36:15 AM (3 years ago)

Author:

eugene

Message:

merge from trunk: spline improvements & string vector equate

Location:

branches/eam_branches/ipp-20220316/Ohana

Files:

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

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/threshold.c

@@ -1 +1 @@
 # include "data.h"
+
+int QUIET = FALSE;
+
+void _threshold_set_values (double value, int Nbin, double level, int thresherr) {
+
+  set_variable ("threshval", value);
+  set_int_variable ("threshbin", Nbin);
+  set_variable ("threshold", level);
+  set_int_variable ("thresherr", thresherr);
+
+  if (!QUIET) gprint (GP_LOG, "theshold %f (bin %d is %f)\n", level, Nbin, value);
+  return;
+}
 
 int threshold (int argc, char **argv) {
@@ -6 +19 @@
   Vector *vecx, *vecy;
 
-  int QUIET = FALSE;
   if ((N = get_argument (argc, argv, "-q"))) {
     QUIET = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  int SATURATE = FALSE;
+  if ((N = get_argument (argc, argv, "-saturate"))) {
+    SATURATE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-sat"))) {
+    SATURATE = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -95 +117 @@
     // this algorithm assumes vecy[BinMax] > threshold, vecy[BinMin] < threshold
     if (vecy[0].elements.Flt[BinMin] > value) {
-      if (!QUIET) gprint (GP_ERR, "ERROR: all values above threshold\n");
-      set_int_variable ("threshbin", BinMin);
-      set_variable ("threshval", vecy[0].elements.Flt[BinMin]);
-      set_variable ("threshold", vecx[0].elements.Flt[BinMin]);
-      set_int_variable ("thresherr", 1);
-      if (!QUIET) gprint (GP_LOG, "theshold %f (bin %d is %f)\n",
-                          vecx[0].elements.Flt[BinMin], BinMin,
-                          vecy[0].elements.Flt[BinMin]);
-      return TRUE;
+      if (SATURATE) {
+        _threshold_set_values (vecy[0].elements.Flt[BinMin], BinMin, vecx[0].elements.Flt[BinMin], 1);
+        return TRUE;
+      } else {
+        gprint (GP_ERR, "ERROR: all values above threshold\n");
+        _threshold_set_values (NAN, -1, NAN, 1);
+        return FALSE;
+      }
     }
     if (vecy[0].elements.Flt[BinMax] < value) {
-      if (!QUIET) gprint (GP_ERR, "ERROR: all values below threshold\n");
-      set_int_variable ("threshbin", BinMax);
-      set_variable ("threshval", vecy[0].elements.Flt[BinMax]);
-      set_variable ("threshold", vecx[0].elements.Flt[BinMax]);
-      set_int_variable ("thresherr", 1);
-      if (!QUIET) gprint (GP_LOG, "theshold %f (bin %d is %f)\n",
-                          vecx[0].elements.Flt[BinMax], BinMax,
-                          vecy[0].elements.Flt[BinMax]);
-      return TRUE;
+      if (SATURATE) {
+        _threshold_set_values (vecy[0].elements.Flt[BinMax], BinMax, vecx[0].elements.Flt[BinMax], 1);
+        return TRUE;
+      } else {
+        gprint (GP_ERR, "ERROR: all values below threshold\n");
+        _threshold_set_values (NAN, -1, NAN, 1);
+        return FALSE;
+      }
     }
     while (Nhi - Nlo > 10) {
@@ -136 +156 @@
     // this algorithm assumes vecy[BinMin] > threshold, vecy[BinMax] < threshold
     if (vecy[0].elements.Flt[BinMin] < value) {
-      if (!QUIET) gprint (GP_ERR, "ERROR: all values below threshold\n");
-      set_int_variable ("threshbin", BinMin);
-      set_variable ("threshval", vecy[0].elements.Flt[BinMin]);
-      set_variable ("threshold", vecx[0].elements.Flt[BinMin]);
-      set_int_variable ("thresherr", 1);
-      if (!QUIET) gprint (GP_LOG, "theshold %f (bin %d is %f)\n",
-                          vecx[0].elements.Flt[BinMin], BinMin,
-                          vecy[0].elements.Flt[BinMin]);
-      return TRUE;
+      if (SATURATE) {
+        _threshold_set_values (vecy[0].elements.Flt[BinMin], BinMin, vecx[0].elements.Flt[BinMin], 1);
+        return TRUE;
+      } else {
+        gprint (GP_ERR, "ERROR: all values below threshold\n");
+        _threshold_set_values (NAN, -1, NAN, 1);
+        return FALSE;
+      }
     }
     if (vecy[0].elements.Flt[BinMax] > value) {
-      if (!QUIET) gprint (GP_ERR, "ERROR: all values above threshold\n");
-      set_int_variable ("threshbin", BinMax);
-      set_variable ("threshval", vecy[0].elements.Flt[BinMax]);
-      set_variable ("threshold", vecx[0].elements.Flt[BinMax]);
-      set_int_variable ("thresherr", 1);
-      if (!QUIET) gprint (GP_LOG, "theshold %f (bin %d is %f)\n",
-                          vecx[0].elements.Flt[BinMax], BinMax,
-                          vecy[0].elements.Flt[BinMax]);
-      return TRUE;
+      if (SATURATE) {
+        _threshold_set_values (vecy[0].elements.Flt[BinMax], BinMax, vecx[0].elements.Flt[BinMax], 1);
+        return TRUE;
+      } else {
+        gprint (GP_ERR, "ERROR: all values above threshold\n");
+        _threshold_set_values (NAN, -1, NAN, 1);
+        return FALSE;
+      }
     }
     while (Nhi - Nlo > 10) {
@@ -202 +220 @@
   }
 
-  set_variable ("threshval", y1);
-  set_variable ("threshold", Xvalue);
-  set_int_variable ("threshbin", Nhi);
-  set_int_variable ("thresherr", 0);
-
-  if (!QUIET) gprint (GP_LOG, "theshold %f (bin %d is %f)\n", Xvalue, Nhi, y1);
-
+  _threshold_set_values (y1, Nhi, Xvalue, 0);
   return (TRUE);
 }