Changeset 40664 for branches/eam_branches/ohana.20190329

Timestamp:

Apr 2, 2019, 8:29:31 PM (7 years ago)

Author:

eugene

Message:

adding vtransitions

Location:

branches/eam_branches/ohana.20190329/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (2 diffs)
• threshold.c (modified) (2 diffs)
• vtransitions.c (added)

branches/eam_branches/ohana.20190329/src/opihi/cmd.data/Makefile

@@ -176 +176 @@
 $(SRC)/vzload.$(ARCH).o            \
 $(SRC)/vpeaks.$(ARCH).o            \
+$(SRC)/vtransitions.$(ARCH).o     \
 $(SRC)/vpop.$(ARCH).o              \
 $(SRC)/vroll.$(ARCH).o             \

branches/eam_branches/ohana.20190329/src/opihi/cmd.data/init.c

@@ -169 +169 @@
 int vshift           PROTO((int, char **));
 int vpeaks           PROTO((int, char **));
+int vtransitions     PROTO((int, char **));
 int vpop             PROTO((int, char **));
 int vsmooth          PROTO((int, char **));
@@ -357 +358 @@
   {1, "vload",        vload,            "load vectors as overlay on image display"},
   {1, "vmaxwell",     vmaxwell,         "fit a Maxwellian to a vector"},
-  {1, "vpeaks",       vpeaks,           "fine coord and flux of peaks in vector"},
+  {1, "vpeaks",       vpeaks,           "find coord and flux of peaks in vector"},
+  {1, "vtransitions", vtransitions,     "find points in vector that cross the transition value"},
   {1, "vpop",         vpop,             "remove first element of a vector"},
   {1, "vroll",        vroll,            "roll vector elements by 1 entry"},

branches/eam_branches/ohana.20190329/src/opihi/cmd.data/threshold.c

@@ -71 +71 @@
 
   if (!REVERSE) {
+    // this algorithm assumes vecy[BinMax] > threshold, vecy[BinMin] < threshold
+    if (vecy[0].elements.Flt[BinMin] > value) {
+      gprint (GP_ERR, "ERROR: all values above threshold\n");
+      return FALSE;
+    }
+    if (vecy[0].elements.Flt[BinMax] < value) {
+      gprint (GP_ERR, "ERROR: all values below threshold\n");
+      return FALSE;
+    }
     while (Nhi - Nlo > 10) {
       N = 0.5*(Nlo + Nhi);
@@ -89 +98 @@
     }
   } else {
+    // this algorithm assumes vecy[BinMin] > threshold, vecy[BinMax] < threshold
+    if (vecy[0].elements.Flt[BinMin] < value) {
+      gprint (GP_ERR, "ERROR: all values below threshold\n");
+      return FALSE;
+    }
+    if (vecy[0].elements.Flt[BinMax] > value) {
+      gprint (GP_ERR, "ERROR: all values above threshold\n");
+      return FALSE;
+    }
     while (Nhi - Nlo > 10) {
       N = 0.5*(Nlo + Nhi);