Changeset 40477 for branches/czw_branch/20170908/Ohana/src/opihi/cmd.data/init.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data/init.c (modified) (8 diffs)

branches/czw_branch/20170908/Ohana/src/opihi/cmd.data/init.c

@@ -55 +55 @@
 int hermitian1d      PROTO((int, char **));
 int hermitian2d      PROTO((int, char **));
+int idxread          PROTO((int, char **));
 int imcut            PROTO((int, char **));
 int imhist           PROTO((int, char **));
@@ -89 +90 @@
 int mset             PROTO((int, char **));
 int needles          PROTO((int, char **));
+int nnet_command     PROTO((int, char **));
 int peak             PROTO((int, char **));
 int periodogram      PROTO((int, char **));
+int periodogram_fm   PROTO((int, char **));
 int plot             PROTO((int, char **));
 int dot              PROTO((int, char **));
@@ -140 +143 @@
 int tvcontour        PROTO((int, char **));
 int tvgrid           PROTO((int, char **));
-int opihi_type             PROTO((int, char **));
+int opihi_type       PROTO((int, char **));
 int uniq             PROTO((int, char **));
+int uniqpair         PROTO((int, char **));
 int unsign           PROTO((int, char **));
 int vbin             PROTO((int, char **));
@@ -149 +153 @@
 int vgrid            PROTO((int, char **));
 int vgauss           PROTO((int, char **));
+int vlorentz         PROTO((int, char **));
 int vellipse         PROTO((int, char **));
 int vmaxwell         PROTO((int, char **));
@@ -232 +237 @@
   {1, "hermitian1d",  hermitian1d,      "generate 1-D Hermitian Polynomial"},
   {1, "hermitian2d",  hermitian2d,      "generate 2-D Hermitian Polynomial"},
+  {1, "idxread",      idxread,          "read vector or image data from an IDX file"},
   {1, "imbin",        rebin,            "rebin image data by factor of N"},
   {1, "imclip",       imclip,           "clip values in an image to be within a range"},
@@ -268 +274 @@
   {1, "imset",        mset,             "insert a vector in an image"},
   {1, "needles",      needles,          "plot vectors needles"},
+  {1, "nnet",         nnet_command,     "Neural Network commands"},
   {1, "parity",       parity,           "set image parity"},
   {1, "peak",         peak,             "find vector peak in range"},
-  {1, "periodogram",  periodogram,      "measure periods in unevenly sampled data"},
+  {1, "periodogram",    periodogram,    "measure periods in unevenly sampled data (Lomb-Scargle)"},
+  {1, "periodogram_fm", periodogram_fm, "measure periods in unevenly sampled data (generalized Lomb-Scargle; floating mean)"},
   {1, "plot",         plot,             "plot a pair of vectors"},
   {1, "png",          jpeg,             "convert display graphic to PNG"},
@@ -323 +331 @@
   {1, "ungridify",    ungridify,        "convert image region to vector triplet"},
   {1, "uniq",         uniq,             "create a uniq vector subset from a vector"},
+  {1, "uniqpair",     uniqpair,         "create a uniq vector subset from a pair of vectors, saving duplicates if desired"},
   {1, "unsign",       unsign,           "toggle the UNSIGN status"},
   {1, "vbin",         vbin,             "rebin vector data by a factor of N"},
@@ -330 +339 @@
   {1, "vtype",        vtype,            "return the vector type (FLT or INT)"},
   {1, "vgauss",       vgauss,           "fit a Gaussian to a vector"},
+  {1, "vlorentz",     vlorentz,         "fit a Lorentzian to a vector"},
   {1, "vellipse",     vellipse,         "fit a Ellipse to a vector pair"},
   {1, "vgrid",        vgrid,            "generate an image from a triplet of vectors"},