Changeset 2826

Timestamp:

Dec 26, 2004, 10:22:20 AM (22 years ago)

Author:

eugene

Message:

added imsmooth, vload, findpeaks

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/Makefile (modified) (2 diffs)
• cmd.data/imsmooth.c (added)
• cmd.data/init.c (modified) (4 diffs)
• cmd.data/vload.c (added)
• include/mana.h (modified) (1 diff)
• lib.data/starfuncs.c (modified) (4 diffs)
• mana/Makefile (modified) (1 diff)
• mana/findpeaks.c (added)
• mana/findrowpeaks.c (added)
• mana/init.c (added)
• mana/mana.c (modified) (2 diffs)

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

@@ -49 +49 @@
 $(SDIR)/gridify.$(ARCH).o       \
 $(SDIR)/histogram.$(ARCH).o     \
+$(SDIR)/imcut.$(ARCH).o         \
 $(SDIR)/imhist.$(ARCH).o        \
-$(SDIR)/imcut.$(ARCH).o \
+$(SDIR)/imsmooth.$(ARCH).o      \
 $(SDIR)/integrate.$(ARCH).o     \
 $(SDIR)/interpolate.$(ARCH).o   \
@@ -106 +107 @@
 $(SDIR)/vclip.$(ARCH).o            \
 $(SDIR)/vgrid.$(ARCH).o            \
+$(SDIR)/vload.$(ARCH).o            \
 $(SDIR)/vstat.$(ARCH).o            \
 $(SDIR)/vroll.$(ARCH).o            \

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

@@ -30 +30 @@
 int gridify          PROTO((int, char **));
 int histogram        PROTO((int, char **));
+int imcut            PROTO((int, char **));
 int imhist           PROTO((int, char **));
-int imcut            PROTO((int, char **));
+int imsmooth         PROTO((int, char **));
 int integrate        PROTO((int, char **));
 int interpolate      PROTO((int, char **));
@@ -87 +88 @@
 int vect_select      PROTO((int, char **));
 int vgrid            PROTO((int, char **));
+int vload            PROTO((int, char **));
 int vstat            PROTO((int, char **));
 int vroll            PROTO((int, char **));
@@ -126 +128 @@
   {"header",       header,           "print buffer header"},
   {"histogram",    histogram,        "generate histogram from vector"},
+  {"imcut",        imcut,            "linear image cut between arbitrary coords"},
   {"imhist",       imhist,           "histogram of an image region"},
+  {"imsmooth",     imsmooth,         "circular gaussian smoothing"},
   {"integrate",    integrate,        "integrate a vector"},
   {"interpolate",  interpolate,      "interpolate between vector pairs"},
-  {"imcut",        imcut,            "linear image cut between arbitrary coords"},
   {"jpeg",         jpeg,             "write text line on graph"},
   {"kern",         kern,             "convolve with 3x3 kernel"},
@@ -182 +185 @@
   {"select",       vect_select,      "selective vector assignment"},
   {"vgrid",        vgrid,            "get info from imreg database"},
+  {"vload",        vload,            "load vectors on Kii"},
   {"vstat",        vstat,            "get info from imreg database"},
   {"vroll",        vroll,            "roll vector elements"},

trunk/Ohana/src/opihi/include/mana.h

@@ +1 @@
+# include "opihi.h"
 
-/* place in program-specific file? */
-# define opihi_name "DVO"
-# define opihi_prompt "dvo: "
-# define opihi_description "Desktop Virtual Observatory\n"
-# define opihi_history ".dvo"
-# define opihi_resource ".dvorc"
+# ifndef MANA_H
+
+int *findrowpeaks (float *row, int Nrow, float threshold, int *npeaks);
+
+# endif

trunk/Ohana/src/opihi/lib.data/starfuncs.c

@@ -6 +6 @@
   double x, y, x2, y2, I, sky, FWHMx, FWHMy, value, mag;
   int i, j, n, Npix2, Nring, Nmax;
-  double Npts, gain, dsky2, dmag;
+  double Npts, gain, dsky2, dmag, peak, offset;
   char *string;
   
@@ -45 +45 @@
   free (ring);
 
+  peak = 0;
   Npts = Nmax = 0;
   x = y = x2 = y2 = I = 0;
@@ -50 +51 @@
     for (j = Y - Npix2; j < Y + Npix2 + 1; j++) {
       value = fits_get_matrix_value (matrix, i, j);
-      x  += i*(value - sky);
-      y  += j*(value - sky);
-      x2 += i*i*(value - sky);
-      y2 += j*j*(value - sky);
-      I  += (value - sky);
+      offset = value - sky;
+      x  += i*offset;
+      y  += j*offset;
+      x2 += i*i*offset;
+      y2 += j*j*offset;
+      I  += offset;
       Npts ++;
       if (value > max) {
         Nmax ++;
       }
+      if (value > peak) peak = value;
     }
   }
@@ -80 +83 @@
   set_variable ("dZg", dmag);
   set_variable ("Zcg", I);
+  set_variable ("Zpk", peak);
   set_int_variable ("Nsat", Nmax);
   

trunk/Ohana/src/opihi/mana/Makefile

@@ -25 +25 @@
 # mana user commands and support functions ########################
 
-mana = \
-$(SDIR)/mana.$(ARCH).o
+manafuncs = \
+$(SDIR)/init.$(ARCH).o \
+$(SDIR)/mana.$(ARCH).o \
+$(SDIR)/findrowpeaks.$(ARCH).o 
+
+manacmds = \
+$(SDIR)/findpeaks.$(ARCH).o 
+
+mana = $(manacmds) $(manafuncs)
 
 libs = \

trunk/Ohana/src/opihi/mana/mana.c

@@ -10 +10 @@
 void InitData ();
 void InitAstro ();
-
+void InitMana ();
 
 void welcome () {
@@ -44 +44 @@
   InitAstro ();
   InitOutfile ();
+  InitMana ();
 
   rl_readline_name = opihi_name;