Changeset 3894

Timestamp:

May 11, 2005, 9:35:40 PM (21 years ago)

Author:

eugene

Message:

cleaned gaussdeviate, added vsmooth

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/gaussdeviate.c (modified) (1 diff)
• cmd.data/init.c (modified) (4 diffs)
• lib.data/gaussian.c (modified) (4 diffs)

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

@@ -29 +29 @@
     
 }
+
+double int_gauss (int i);
+
+int gaussintegral (int argc, char **argv) {
+  
+  int i, Npts;
+  double mean, sigma;
+  Vector *vec;
+
+  if (argc != 5) goto usage;
+
+  if ((vec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) return (FALSE);    
+
+  Npts = atoi (argv[2]);
+  mean = atof (argv[3]);
+  sigma = atof (argv[4]);
+
+  vec[0].Nelements = Npts;
+  REALLOCATE (vec[0].elements, float, Npts);
+
+  gauss_init (Npts);
+  for (i = 0; i < Npts; i++) {
+    vec[0].elements[i] = int_gauss (i);
+  }
+  return (TRUE);
+
+ usage:
+  fprintf (stderr, "USAGE: gaussintegral Npts mean sigma\n");
+  return (FALSE);
+    
+}

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

@@ -27 +27 @@
 int gaussjordan      PROTO((int, char **));
 int gaussdeviate     PROTO((int, char **));
+int gaussintegral    PROTO((int, char **));
 int grid             PROTO((int, char **));
 int gridify          PROTO((int, char **));
@@ -95 +96 @@
 int vroll            PROTO((int, char **));
 int vpop             PROTO((int, char **));
+int vsmooth          PROTO((int, char **));
 int wd               PROTO((int, char **));
 int write_vectors    PROTO((int, char **));
@@ -127 +129 @@
   {"gaussj",       gaussjordan,      "solve Ax = B (N-D)"},
   {"gaussdev",     gaussdeviate,     "generate a gaussian deviate vector"},
+  {"gaussint",     gaussintegral,    "return the integrated gaussian vector"},
   {"grid",         grid,             "plot cartesian grid"},
   {"gridify",      gridify,          "convert vector triplet to buffer"},
@@ -193 +196 @@
   {"vload",        vload,            "load vectors on Kii"},
   {"vstat",        vstat,            "get info from imreg database"},
+  {"vsmooth",      vsmooth,          "gaussian smooth of a vector"},
   {"vroll",        vroll,            "roll vector elements"},
   {"vpop",         vpop,             "remove first element"},

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

@@ -1 +1 @@
 # include "data.h"
 
-static int Ngaussint;
+static int Ngaussint = 0;
 static double *gaussint;
 
@@ -24 +24 @@
   double mean, sigma;
  
+  /* no need to generate this if it already exists */
+  if (Ngaussint == Nbin) return;
+
   A = time(NULL);
   for (B = 0; A == time(NULL); B++);
@@ -45 +48 @@
           3.0*gaussian(x+dx3, mean, sigma)) * (dx1/8.0);
     val += df;
-    if (val > (i / (double) Ngaussint)) {
+    if (val > (i + 0.5) / (double) Ngaussint) {
       gaussint[i] = x + dx / 2.0;
       i++;
@@ -65 +68 @@
 }
  
+double int_gauss (int i) {
+  double y;
+  y = gaussint[i];
+  return (y);
+}
+