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

Timestamp:

Apr 20, 2014, 6:00:00 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20140402 (Ohana mods for median donuts)

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/cmd.data/Makefile (modified) (2 diffs)
• Ohana/src/opihi/cmd.data/impeaks.c (copied) (copied from branches/eam_branches/ipp-20140402/Ohana/src/opihi/cmd.data/impeaks.c )
• Ohana/src/opihi/cmd.data/init.c (modified) (4 diffs)
• Ohana/src/opihi/cmd.data/medimage.c (copied) (copied from branches/eam_branches/ipp-20140402/Ohana/src/opihi/cmd.data/medimage.c )
• Ohana/src/opihi/cmd.data/medimage_commands.c (copied) (copied from branches/eam_branches/ipp-20140402/Ohana/src/opihi/cmd.data/medimage_commands.c )
• Ohana/src/opihi/cmd.data/rebin.c (modified) (1 diff)
• Ohana/src/opihi/cmd.data/test/medimage.sh (copied) (copied from branches/eam_branches/ipp-20140402/Ohana/src/opihi/cmd.data/test/medimage.sh )
• Ohana/src/opihi/cmd.data/vellipse.c (modified) (1 diff)

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

@@ -64 +64 @@
 $(SRC)/imcut.$(ARCH).o          \
 $(SRC)/imhist.$(ARCH).o \
+$(SRC)/impeaks.$(ARCH).o        \
 $(SRC)/imsmooth.$(ARCH).o       \
 $(SRC)/imsmooth.generic.$(ARCH).o       \
@@ -88 +89 @@
 $(SRC)/mget.$(ARCH).o           \
 $(SRC)/minterpolate.$(ARCH).o   \
+$(SRC)/medimage.$(ARCH).o       \
+$(SRC)/medimage_commands.$(ARCH).o \
 $(SRC)/mset.$(ARCH).o           \
 $(SRC)/peak.$(ARCH).o           \

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

@@ -53 +53 @@
 int imcut            PROTO((int, char **));
 int imhist           PROTO((int, char **));
+int impeaks          PROTO((int, char **));
 int imsmooth         PROTO((int, char **));
 int imsmooth_generic PROTO((int, char **));
@@ -78 +79 @@
 int mget             PROTO((int, char **));
 int minterp          PROTO((int, char **));
+int medimage_command PROTO((int, char **));
 int mset             PROTO((int, char **));
 int peak             PROTO((int, char **));
@@ -211 +213 @@
   {1, "imcut",        imcut,            "linear image cut between arbitrary coords"},
   {1, "imhistogram",  imhist,           "histogram of an image region"},
+  {1, "impeaks",      impeaks,          "find peaks in an image (return vectors)"},
   {1, "imsmooth",     imsmooth,         "circular gaussian smoothing"},
   {1, "imsmooth.generic", imsmooth_generic, "circular non-gaussian smoothing"},
@@ -233 +236 @@
   {1, "minterp",      minterp,          "interpolate image pixels"},
   {1, "iminterp",     minterp,          "interpolate image pixels"},
+  {1, "medimage",     medimage_command, "median image manipulation"},
   {1, "matrix",       matrix,           "matrix math operations"},
   {1, "match2d",      match2d,          "match 2 pairs of X,Y vectors and return matched indexes"},

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

@@ -133 +133 @@
               *Vout += *Vin;
               if (Normalize) {(*Vn) ++;}
+              // if ((i == 1) && (j == 1)) fprintf (stderr, "%d,%d : %d,%d : %f : %f : %d\n", i, j, x, y, *Vin, *Vout, *Vn);
             }
             if (Normalize) {Vn ++;}

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

@@ -228 +228 @@
  */
 
+// XXX NOTE that PHI is defined with the wrong sign, should fix this...
 opihi_flt fellipseOD (opihi_flt alpha, opihi_flt *par, int Npar, opihi_flt *dpar) {