Changeset 42389 for trunk/Ohana/src/opihi/cmd.data/threshold.c

Timestamp:

Feb 8, 2023, 12:17:35 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:

trunk/Ohana

Files:

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

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

@@ -3 +3 @@
 int QUIET = FALSE;
 
-void _threshold_set_values (double value, int Nbin, double level) {
+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);
@@ -117 +118 @@
     if (vecy[0].elements.Flt[BinMin] > value) {
       if (SATURATE) {
-        _threshold_set_values (vecy[0].elements.Flt[BinMin], BinMin, vecx[0].elements.Flt[BinMin]);
+        _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);
+        _threshold_set_values (NAN, -1, NAN, 1);
         return FALSE;
       }
@@ -127 +128 @@
     if (vecy[0].elements.Flt[BinMax] < value) {
       if (SATURATE) {
-        _threshold_set_values (vecy[0].elements.Flt[BinMax], BinMax, vecx[0].elements.Flt[BinMax]);
+        _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);
+        _threshold_set_values (NAN, -1, NAN, 1);
         return FALSE;
       }
@@ -156 +157 @@
     if (vecy[0].elements.Flt[BinMin] < value) {
       if (SATURATE) {
-        _threshold_set_values (vecy[0].elements.Flt[BinMin], BinMin, vecx[0].elements.Flt[BinMin]);
+        _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);
+        _threshold_set_values (NAN, -1, NAN, 1);
         return FALSE;
       }
@@ -166 +167 @@
     if (vecy[0].elements.Flt[BinMax] > value) {
       if (SATURATE) {
-        _threshold_set_values (vecy[0].elements.Flt[BinMax], BinMax, vecx[0].elements.Flt[BinMax]);
+        _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);
+        _threshold_set_values (NAN, -1, NAN, 1);
         return FALSE;
       }
@@ -219 +220 @@
   }
 
-  _threshold_set_values (y1, Nhi, Xvalue);
+  _threshold_set_values (y1, Nhi, Xvalue, 0);
   return (TRUE);
 }