Changeset 39242 for trunk/Ohana/src/opihi

Timestamp:

Dec 9, 2015, 3:42:26 PM (11 years ago)

Author:

eugene

Message:

move multple copies of gaussian deviates to libohana

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/gaussdeviate.c (modified) (3 diffs)
• lib.data/Makefile (modified) (2 diffs)
• mana/simsignal.c (modified) (3 diffs)

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

@@ -17 +17 @@
   ResetVector (vec, OPIHI_FLT, Npts);
 
-  gauss_init (2048);
+  gaussdev_init ();
   for (i = 0; i < Npts; i++) {
-    vec[0].elements.Flt[i] = rnd_gauss (mean, sigma);
+    vec[0].elements.Flt[i] = gaussdev_rnd (mean, sigma);
   }
   return (TRUE);
@@ -28 +28 @@
     
 }
-
-double int_gauss (int i);
 
 int gaussintegral (int argc, char **argv) {
@@ -46 +44 @@
   ResetVector (vec, OPIHI_FLT, Npts);
 
-  gauss_init (Npts);
+  gaussdev_init ();
   for (i = 0; i < Npts; i++) {
-    vec[0].elements.Flt[i] = int_gauss (i);
+    vec[0].elements.Flt[i] = gaussian_int (i);
   }
   return (TRUE);

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

@@ -30 +30 @@
 $(SDIR)/starfuncs.$(ARCH).o             \
 $(SDIR)/hermitian.$(ARCH).o             \
-$(SDIR)/gaussian.$(ARCH).o              \
 $(SDIR)/graphtools.$(ARCH).o            \
 $(SDIR)/queues.$(ARCH).o                \
@@ -36 +35 @@
 $(SDIR)/open_kapa.$(ARCH).o             \
 $(SDIR)/style_args.$(ARCH).o
+
+# moved to libohana
+# $(SDIR)/gaussian.$(ARCH).o            \
 
 # fix malloc

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

@@ -6 +6 @@
   float *buf;
   double cvalue, dvalue, sigma, SN, period;
-  double rnd_gauss ();
 
   if (argc != 5) {
@@ -28 +27 @@
     ivalue = scale * 0.5 * (sin (i*2*M_PI/period) + 1) + 0.5;
     /*
-    dvalue = rnd_gauss (cvalue, sigma);
+    dvalue = gaussdev_rnd (cvalue, sigma);
     cvalue = (dvalue + range) / (2.0*range);
     dvalue = MAX (0, MIN (0.99999, cvalue));
@@ -44 +43 @@
 8 bit = 2^8
 
-  gauss_init (2*scale);
+  gaussdev_init ();
   sigma = 2.0 / SN;
   range = 1 + 5*sigma;