Changeset 42685

Timestamp:

Jun 1, 2024, 3:19:28 PM (2 years ago)

Author:

eugene

Message:

add usage info; fix end-point error in vgroup

Location:

branches/eam_branches/ipp-20230313/Ohana/src/opihi/cmd.data

Files:

• interpolate_presort.c (modified) (2 diffs)
• vgroup.c (modified) (2 diffs)

branches/eam_branches/ipp-20230313/Ohana/src/opihi/cmd.data/interpolate_presort.c

@@ -17 +17 @@
   /** check basic syntax **/
   if (argc != 5) {
-    gprint (GP_ERR, "USAGE: interpolate Xi Yi Xo Yo\n");
+    gprint (GP_ERR, "USAGE: interpolate Xi Yi Xo Yo [-fill-ends]\n");
     gprint (GP_ERR, "  Xi Yi - sorted reference vectors\n");
     gprint (GP_ERR, "  Xo    - output positions (vector)\n");
@@ -23 +23 @@
     gprint (GP_ERR, "  (vectors must be pre-sorted)\n");
     gprint (GP_ERR, "  (use 'threshold' to interpolate to a value)\n");
+    gprint (GP_ERR, "  -fill-ends : values outside of range are set to end-point values\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20230313/Ohana/src/opihi/cmd.data/vgroup.c

@@ -70 +70 @@
   ALLOCATE (values, double, xin[0].Nelements);
 
-  for (i = 0; i < xout[0].Nelements - 1; i++) {
+  // if we specify binsize, then we need to examine all bins
+  int Nout = isnan(binsize) ? xout[0].Nelements - 1 : xout[0].Nelements;
+  for (i = 0; i < Nout; i++) {
     if (isnan(binsize)) {
       xmin = xout[0].elements.Flt[i];
@@ -81 +83 @@
     N = 0;
     for (j = 0; j < xin[0].Nelements; j++) {
-      if (xin[0].elements.Flt[j] < xmin) continue;
-      if (xin[0].elements.Flt[j] > xmax) continue;
+      if (xin[0].elements.Flt[j] <  xmin) continue;
+      if (xin[0].elements.Flt[j] >= xmax) continue;
       if (yin) {
         values[N] = yin[0].elements.Flt[j];