Changeset 42821 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

May 8, 2025, 4:29:52 PM (14 months ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20230313

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data/Makefile (modified) (2 diffs)
• src/opihi/cmd.data/histbins.c (copied) (copied from branches/eam_branches/ipp-20230313/Ohana/src/opihi/cmd.data/histbins.c )
• src/opihi/cmd.data/impoints.c (copied) (copied from branches/eam_branches/ipp-20230313/Ohana/src/opihi/cmd.data/impoints.c )
• src/opihi/cmd.data/init.c (modified) (4 diffs)
• src/opihi/cmd.data/interpolate_presort.c (modified) (2 diffs)
• src/opihi/cmd.data/vgroup.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -67 +67 @@
 $(SRC)/ungridify.$(ARCH).o     \
 $(SRC)/histogram.$(ARCH).o      \
+$(SRC)/histbins.$(ARCH).o       \
 $(SRC)/tdhistogram.$(ARCH).o    \
 $(SRC)/hermitian1d.$(ARCH).o    \
@@ -80 +81 @@
 $(SRC)/imresample.$(ARCH).o     \
 $(SRC)/imcollapse.$(ARCH).o     \
+$(SRC)/impoints.$(ARCH).o       \
 $(SRC)/integrate.$(ARCH).o      \
 $(SRC)/interpolate.$(ARCH).o    \

trunk/Ohana/src/opihi/cmd.data/init.c

@@ -56 +56 @@
 int ungridify        PROTO((int, char **));
 int histogram        PROTO((int, char **));
+int histbins         PROTO((int, char **));
 int tdhistogram      PROTO((int, char **));
 int hermitian1d      PROTO((int, char **));
@@ -70 +71 @@
 int imresample       PROTO((int, char **));
 int imcollapse       PROTO((int, char **));
+int impoints         PROTO((int, char **));
 int integrate        PROTO((int, char **));
 int interpolate      PROTO((int, char **));
@@ -265 +267 @@
   {1, "header",       header,           "print image header"},
   {1, "histogram",    histogram,        "generate histogram from vector"},
+  {1, "histbins",     histbins,         "generate histogram from vector, bins specified by vectors"},
   {1, "tdhistogram",  tdhistogram,      "generate 2D histogram image from vector set"},
   {1, "hermitian1d",  hermitian1d,      "generate 1-D Hermitian Polynomial"},
@@ -281 +284 @@
   {1, "imconvolve",   imconvolve,       "full 2D real-space convolution"},
   {1, "imstats",      imstats,          "statistics on a portion of an image"},
+  {1, "impoints",     impoints,         "insert points into an image by vector pair"},
   {1, "integrate",    integrate,        "integrate a vector"},
   {1, "interpolate_presort",  interpolate_presort,      "interpolate between vector pairs"},

trunk/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);
   }

trunk/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];