Changeset 40752

Timestamp:

May 25, 2019, 8:59:46 AM (7 years ago)

Author:

eugene

Message:

add functions to fit a sigmoid to a vector and to match two vectors in 1D; allow vtransitions to be restricted to a value range

Location:

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

Files:

• Makefile (modified) (2 diffs)
• init.c (modified) (4 diffs)
• match1d.c (added)
• test/vsigmoid.sh (added)
• threshold.c (modified) (2 diffs)
• vsigmoid.c (added)
• vtransitions.c (modified) (1 diff)

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

@@ -90 +90 @@
 $(SRC)/lookup.$(ARCH).o \
 $(SRC)/matrix.$(ARCH).o \
+$(SRC)/match1d.$(ARCH).o        \
 $(SRC)/match2d.$(ARCH).o        \
 $(SRC)/mkrgb.$(ARCH).o  \
@@ -170 +171 @@
 $(SRC)/vgauss.$(ARCH).o            \
 $(SRC)/vlorentz.$(ARCH).o          \
+$(SRC)/vsigmoid.$(ARCH).o          \
 $(SRC)/vellipse.$(ARCH).o          \
 $(SRC)/vmaxwell.$(ARCH).o          \

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

@@ -80 +80 @@
 int lookup           PROTO((int, char **));
 int matrix           PROTO((int, char **));
+int match1d          PROTO((int, char **));
 int match2d          PROTO((int, char **));
 int mkrgb            PROTO((int, char **));
@@ -157 +158 @@
 int vgauss           PROTO((int, char **));
 int vlorentz         PROTO((int, char **));
+int vsigmoid         PROTO((int, char **));
 int vellipse         PROTO((int, char **));
 int vmaxwell         PROTO((int, char **));
@@ -279 +281 @@
   {1, "medimage",     medimage_command, "median image manipulation"},
   {1, "matrix",       matrix,           "matrix math operations"},
+  {1, "match1d",      match1d,          "match 2 vectors and return matched indexes"},
   {1, "match2d",      match2d,          "match 2 pairs of X,Y vectors and return matched indexes"},
   {1, "mkrgb",        mkrgb,            "convert 3 images to rgb jpeg (use Kapa for better control)"},
@@ -353 +356 @@
   {1, "vgauss",       vgauss,           "fit a Gaussian to a vector"},
   {1, "vlorentz",     vlorentz,         "fit a Lorentzian to a vector"},
+  {1, "vsigmoid",     vsigmoid,         "fit a Sigmoid to a vector"},
   {1, "vellipse",     vellipse,         "fit a Ellipse to a vector pair"},
   {1, "vgrid",        vgrid,            "generate an image from a triplet of vectors"},

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

@@ -25 +25 @@
     remove_argument (N, &argc, argv);
     BinMax = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  float ValMin = NAN;
+  float ValMax = NAN;
+  if ((N = get_argument (argc, argv, "-vrange"))) {
+    remove_argument (N, &argc, argv);
+    ValMin = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    ValMax = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -62 +72 @@
     }
     if (BinMax < 0) BinMax += vecx[0].Nelements;
+  }
+
+  // ValMin, ValMax not compatible with BinMin, BinMax
+  if (isfinite(ValMin)) {
+    int binTest = ohana_bisection_double (vecx[0].elements.Flt, vecx[0].Nelements, ValMin);
+    BinMin = (vecx[0].elements.Flt[binTest+1] == ValMin) ? binTest : binTest + 1;
+    // XXX dangerous: check that this does not run off the end, etc
+  }
+  if (isfinite(ValMax)) {
+    int binTest = ohana_bisection_double (vecx[0].elements.Flt, vecx[0].Nelements, ValMax);
+    BinMax = (vecx[0].elements.Flt[binTest+1] == ValMax) ? binTest : binTest + 1;
+    // XXX dangerous: check that this does not run off the end, etc
   }
 

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

@@ -137 +137 @@
   ResetVector (outpos, OPIHI_FLT,    Nout);
 
-  if (!QUIET) gprint (GP_LOG, "found %d transitions)\n", Nout);
+  if (!QUIET) gprint (GP_LOG, "found %d transitions\n", Nout);
 
   return (TRUE);