Changeset 41963

Timestamp:

Dec 21, 2021, 1:52:49 PM (5 years ago)

Author:

eugene

Message:

add imcollapse and imresample functions; improve the usage info

Location:

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

Files:

• Makefile (modified) (1 diff)
• cut.c (modified) (1 diff)
• imcollapse.c (added)
• imcut.c (modified) (2 diffs)
• imresample.c (added)
• init.c (modified) (4 diffs)
• medacc.c (modified) (1 diff)

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.data/Makefile

@@ -78 +78 @@
 $(SRC)/imsmooth.2d.$(ARCH).o    \
 $(SRC)/imconvolve.$(ARCH).o     \
+$(SRC)/imresample.$(ARCH).o     \
+$(SRC)/imcollapse.$(ARCH).o     \
 $(SRC)/integrate.$(ARCH).o      \
 $(SRC)/interpolate.$(ARCH).o    \

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.data/cut.c

@@ -96 +96 @@
   if (argc != 9) {
     gprint (GP_ERR, "USAGE: cut <buffer> <X vector> <Y vector> <X|Y> sx sy nx ny\n");
+    gprint (GP_ERR, "  extract a vector in the X or Y direction based on the pixel values in window\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.data/imcut.c

@@ -9 +9 @@
   float *V;
 
-  if (argc != 8) {
-    gprint (GP_ERR, "USAGE: cut <buffer> <X vector> <Y vector> xs ys xe ye\n");
-    return (FALSE);
-  }
+  if (argc != 8) goto usage;
 
   if ((buf  = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) goto missed;
@@ -51 +48 @@
 
  usage: 
-  gprint (GP_ERR, "USAGE: circstats <buffer> x y radius\n");
+  gprint (GP_ERR, "USAGE: imcut <buffer> <X vector> <Y vector> xs ys xe ye\n");
+  gprint (GP_ERR, " extract pixels along the line from (xs,ys) to (xe,ye)\n");
+  gprint (GP_ERR, " (see also imvector)\n");
   return (FALSE);
 

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.data/init.c

@@ -18 +18 @@
 int clear            PROTO((int, char **));
 int clip             PROTO((int, char **));
-int imclip           PROTO((int, char **));
 int close_device     PROTO((int, char **));
 int concat           PROTO((int, char **));
@@ -61 +60 @@
 int hermitian2d      PROTO((int, char **));
 int idxread          PROTO((int, char **));
+int imclip           PROTO((int, char **));
 int imcut            PROTO((int, char **));
 int imhist           PROTO((int, char **));
@@ -68 +68 @@
 int imsmooth_2d      PROTO((int, char **));
 int imconvolve       PROTO((int, char **));
+int imresample       PROTO((int, char **));
+int imcollapse       PROTO((int, char **));
 int integrate        PROTO((int, char **));
 int interpolate      PROTO((int, char **));
@@ -266 +268 @@
   {1, "imclip",       imclip,           "clip values in an image to be within a range"},
   {1, "imcut",        imcut,            "linear image cut between arbitrary coords"},
+  {1, "imresample",   imresample,       "extract arbitrary window from image"},
+  {1, "imcollapse",   imcollapse,       "collapse to histogram along axis"},
   {1, "imhistogram",  imhist,           "histogram of an image region"},
   {1, "impeaks",      impeaks,          "find peaks in an image (return vectors)"},

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.data/medacc.c

@@ -10 +10 @@
   if ((argc != 6) && (argc != 7)) {
     gprint (GP_ERR, "USAGE: medacc <value> <vector> <key> start end [delta]\n");
+    gprint (GP_ERR, "  value and key are vectors of the same length\n");
+    gprint (GP_ERR, "  the output vector bins correspond to values ranging from start to end in steps of delta (default 1)\n");
+    gprint (GP_ERR, "  for a given output bin, all input values for which the key matches the output bin are averaged\n");
+
     return (FALSE);
   }