Changeset 40836 for branches/eam_branches/ohana.20190329/src/opihi/cmd.data/spline_commands.c

Timestamp:

Jul 19, 2019, 5:31:16 PM (7 years ago)

Author:

eugene

Message:

avoid NANs in peak detection; do not allow splines with < 3 pts; add vgauss -apply option

File:

• branches/eam_branches/ohana.20190329/src/opihi/cmd.data/spline_commands.c (modified) (6 diffs)

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

@@ -28 +28 @@
   if (xvec->Nelements != yvec->Nelements) {
     gprint (GP_ERR, "x and y vectors must be the same length\n");
+    return FALSE;
+  }
+
+  if (xvec->Nelements < 3) {
+    gprint (GP_ERR, "cannot make a spline with fewer than 3 knots\n");
     return FALSE;
   }
@@ -132 +137 @@
 
   int N, status;
-  Spline *spline;
 
   int QUIET = FALSE;
@@ -145 +149 @@
   }
 
-  spline = FindSpline (argv[1]);
+  Spline *spline = FindSpline (argv[1]);
   if (spline == NULL) {
     if (QUIET) return TRUE;
@@ -159 +163 @@
 int spline_rename (int argc, char **argv) {
 
-  Spline *spline;
-
   if (argc != 3) {
     gprint (GP_ERR, "USAGE: spline rename (spline) (newname)\n");
@@ -166 +168 @@
   }
 
-  spline = FindSpline (argv[1]);
+  Spline *spline = FindSpline (argv[1]);
   if (spline == NULL) {
     gprint (GP_ERR, "spline %s not found\n", argv[1]);
     return FALSE;
+  }
+
+  Spline *newname = FindSpline (argv[2]);
+  if (newname != NULL) {
+    DeleteSpline (newname);
   }
 
@@ -176 +183 @@
   return TRUE;
 }
-
-/* 
-int spline_listspline (int argc, char **argv) {
-
-  Spline *spline;
-
-  if (argc != 2) {
-    gprint (GP_ERR, "USAGE: spline listspline (spline)\n");
-    return FALSE;
-  }
-
-  spline = FindSpline (argv[1]);
-  if (spline == NULL) {
-    gprint (GP_ERR, "spline %s not found\n", argv[1]);
-    return FALSE;
-  }
-
-  ListPages (spline);
-  return TRUE;
-}
-*/
-