Index: trunk/Ohana/src/addstar/src/mkcmf.c =================================================================== --- trunk/Ohana/src/addstar/src/mkcmf.c (revision 39247) +++ trunk/Ohana/src/addstar/src/mkcmf.c (revision 39248) @@ -280,5 +280,5 @@ } - gaussdev_init (); + ohana_gaussdev_init (); // load test stars from a file: @@ -578,7 +578,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -624,7 +624,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -673,7 +673,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -724,7 +724,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -781,7 +781,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -842,7 +842,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -911,7 +911,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -1018,7 +1018,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); @@ -1122,7 +1122,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN * gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN * ohana_gaussdev_rnd(0.0, 1.0); flux = pow(10.0, -0.4 * M[i]); fSN = 1.0 / sqrt(flux); @@ -1248,7 +1248,7 @@ if (ADDNOISE) { - X[i] += FX * fSN * gaussdev_rnd(0.0, 1.0); - Y[i] += FY * fSN * gaussdev_rnd(0.0, 1.0); - M[i] += fSN*gaussdev_rnd(0.0, 1.0); + X[i] += FX * fSN * ohana_gaussdev_rnd(0.0, 1.0); + Y[i] += FY * fSN * ohana_gaussdev_rnd(0.0, 1.0); + M[i] += fSN*ohana_gaussdev_rnd(0.0, 1.0); flux = pow (10.0, -0.4*M[i]); fSN = 1.0 / sqrt(flux); Index: trunk/Ohana/src/fakeastro/src/fakeastro.c =================================================================== --- trunk/Ohana/src/fakeastro/src/fakeastro.c (revision 39247) +++ trunk/Ohana/src/fakeastro/src/fakeastro.c (revision 39248) @@ -3,5 +3,5 @@ int main (int argc, char **argv) { - gaussdev_init (); + ohana_gaussdev_init (); /* get configuration info, args */ Index: trunk/Ohana/src/fakeastro/src/make_2mass_measures.c =================================================================== --- trunk/Ohana/src/fakeastro/src/make_2mass_measures.c (revision 39247) +++ trunk/Ohana/src/fakeastro/src/make_2mass_measures.c (revision 39248) @@ -80,6 +80,6 @@ // uR,uD in linear arcsec - double dRsee = gaussdev_rnd (0.0, 1.0 / SN); - double dDsee = gaussdev_rnd (0.0, 1.0 / SN); + double dRsee = ohana_gaussdev_rnd (0.0, 1.0 / SN); + double dDsee = ohana_gaussdev_rnd (0.0, 1.0 / SN); double dRoff = (dRpm + dRsee) / 3600.0; Index: trunk/Ohana/src/fakeastro/src/make_fake_stars_catalog.c =================================================================== --- trunk/Ohana/src/fakeastro/src/make_fake_stars_catalog.c (revision 39247) +++ trunk/Ohana/src/fakeastro/src/make_fake_stars_catalog.c (revision 39248) @@ -113,6 +113,6 @@ // uR,uD in linear arcsec - double dRsee = gaussdev_rnd (0.0, 1.0 / SN); - double dDsee = gaussdev_rnd (0.0, 1.0 / SN); + double dRsee = ohana_gaussdev_rnd (0.0, 1.0 / SN); + double dDsee = ohana_gaussdev_rnd (0.0, 1.0 / SN); double dRoff = (dRpm + dRsee) / 3600.0; Index: trunk/Ohana/src/fakeastro/src/make_fakeqsos.c =================================================================== --- trunk/Ohana/src/fakeastro/src/make_fakeqsos.c (revision 39247) +++ trunk/Ohana/src/fakeastro/src/make_fakeqsos.c (revision 39248) @@ -51,5 +51,5 @@ // Mr will be interpretted as m_r - double Mr = gaussdev_rnd (18.0, 1.5); + double Mr = ohana_gaussdev_rnd (18.0, 1.5); stars[i].R = R; Index: trunk/Ohana/src/fakeastro/src/make_fakestars.c =================================================================== --- trunk/Ohana/src/fakeastro/src/make_fakestars.c (revision 39247) +++ trunk/Ohana/src/fakeastro/src/make_fakestars.c (revision 39248) @@ -48,5 +48,5 @@ int inPatch = FALSE; while (!inPatch) { - z = gaussdev_rnd (0.0, FAKEASTRO_ZGAL); + z = ohana_gaussdev_rnd (0.0, FAKEASTRO_ZGAL); r = sqrt(drand48()) * FAKEASTRO_RGAL; Lrad = drand48() * 2 * M_PI; @@ -98,7 +98,7 @@ double Mr; if (bigPeak) { - Mr = gaussdev_rnd (11.25, 1.0); + Mr = ohana_gaussdev_rnd (11.25, 1.0); } else { - Mr = gaussdev_rnd (10.00, 2.5); + Mr = ohana_gaussdev_rnd (10.00, 2.5); } Index: trunk/Ohana/src/libohana/include/ohana.h =================================================================== --- trunk/Ohana/src/libohana/include/ohana.h (revision 39247) +++ trunk/Ohana/src/libohana/include/ohana.h (revision 39248) @@ -487,8 +487,8 @@ /* in gaussdev.c */ -double gaussian (double x, double mean, double sigma); -void gaussdev_init (void); -void gaussdev_free (void); -double gaussdev_rnd (double mean, double sigma); - -# endif +double ohana_gaussian (double x, double mean, double sigma); +void ohana_gaussdev_init (void); +void ohana_gaussdev_free (void); +double ohana_gaussdev_rnd (double mean, double sigma); + +# endif Index: trunk/Ohana/src/libohana/src/gaussdev.c =================================================================== --- trunk/Ohana/src/libohana/src/gaussdev.c (revision 39247) +++ trunk/Ohana/src/libohana/src/gaussdev.c (revision 39248) @@ -8,5 +8,5 @@ // return the value of a gaussian at position x with mean,sigma -double gaussian (double x, double mean, double sigma) { +double ohana_gaussian (double x, double mean, double sigma) { double f; @@ -21,5 +21,5 @@ /* integrate a gaussian from -10 sigma to +10 sigma */ // how long does this take with a reasonably high resolution? -void gaussdev_init (void) { +void ohana_gaussdev_init (void) { int i; @@ -42,8 +42,8 @@ for (i = 0, x = -10.0; (i < Ngaussint) && (x <= 10.0); x += dx) { - df = (3.0*gaussian(x , mean, sigma) + - 9.0*gaussian(x+dx1, mean, sigma) + - 9.0*gaussian(x+dx2, mean, sigma) + - 3.0*gaussian(x+dx3, mean, sigma)) * (dx1/8.0); + df = (3.0*ohana_gaussian(x , mean, sigma) + + 9.0*ohana_gaussian(x+dx1, mean, sigma) + + 9.0*ohana_gaussian(x+dx2, mean, sigma) + + 3.0*ohana_gaussian(x+dx3, mean, sigma)) * (dx1/8.0); val += df; if (val > (i + 0.5) / (double) Ngaussint) { @@ -55,5 +55,5 @@ } -void gaussdev_free (void) { +void ohana_gaussdev_free (void) { free (gaussint); } @@ -61,5 +61,5 @@ // return a number drawn from a gaussian deviate with mean, sigma // must first call gaussdev_init() -double gaussdev_rnd (double mean, double sigma) { +double ohana_gaussdev_rnd (double mean, double sigma) { int i; @@ -77,5 +77,5 @@ // return the value of \int gaussian(x,mean,sigma) // double gaussian_integral (double x, double mean, double sigma) { -double gaussian_integral (int i) { +double ohana_gaussian_integral (int i) { // int i = (x - mean) / (sigma * Ngaussint); Index: trunk/Ohana/src/misc/src/fakedist.c =================================================================== --- trunk/Ohana/src/misc/src/fakedist.c (revision 39247) +++ trunk/Ohana/src/misc/src/fakedist.c (revision 39248) @@ -39,5 +39,5 @@ init_outmatrix (); - gaussdev_init (); + ohana_gaussdev_init (); read_datafiles (); @@ -343,6 +343,6 @@ if (noise < dMo) { *Noise = noise; - *mag = gaussdev_rnd (v, noise); - *color = gaussdev_rnd (uv, 1.4*noise); + *mag = ohana_gaussdev_rnd (v, noise); + *color = ohana_gaussdev_rnd (uv, 1.4*noise); return; } @@ -436,6 +436,6 @@ Ngood = 1.0; for (k = 0; k < NTRY; k++) { - v = gaussdev_rnd (mag, noise); - uv = gaussdev_rnd (color, 1.4*noise); + v = ohana_gaussdev_rnd (mag, noise); + uv = ohana_gaussdev_rnd (color, 1.4*noise); x = (uv - UV0 - 0.7*A_V) / DUV; y = (v - V0 - Dist - A_V) / DV; Index: trunk/Ohana/src/misc/src/fakepop.c =================================================================== --- trunk/Ohana/src/misc/src/fakepop.c (revision 39247) +++ trunk/Ohana/src/misc/src/fakepop.c (revision 39248) @@ -36,5 +36,5 @@ gfits_scan (&UV_h, "DEC_Y", "%lf", 1, &ldM); - gaussdev_init (); + ohana_gaussdev_init (); fprintf (stderr, "beginning main loop\n"); @@ -57,6 +57,6 @@ v = gfits_get_matrix_value (&V_i, X, Y) + d + Av; noise = dVo*sqrt(1.0 + pow (10.0, (0.4*(v - dVref)))); - V = gaussdev_rnd (v, noise); - UV = gaussdev_rnd (uv, 1.4*noise); + V = ohana_gaussdev_rnd (v, noise); + UV = ohana_gaussdev_rnd (uv, 1.4*noise); if (noise < dMo) { fprintf (stdout, "%f %f %f %f %f %f\n", V, noise, V+UV, noise, mass, age); Index: trunk/Ohana/src/misc/src/fakestars.c =================================================================== --- trunk/Ohana/src/misc/src/fakestars.c (revision 39247) +++ trunk/Ohana/src/misc/src/fakestars.c (revision 39248) @@ -41,5 +41,5 @@ offset = atof (argv[4]); - gaussdev_init (); + ohana_gaussdev_init (); /* load header, open file */ @@ -94,5 +94,5 @@ dMr = 0.001 * stars[i].dM; dMo = hypot (dMs, dMr); - dM = gaussdev_rnd (0.0, dMo); + dM = ohana_gaussdev_rnd (0.0, dMo); stars[i].M += dM + offset; } Index: trunk/Ohana/src/misc/src/fitdist.c =================================================================== --- trunk/Ohana/src/misc/src/fitdist.c (revision 39247) +++ trunk/Ohana/src/misc/src/fitdist.c (revision 39248) @@ -39,5 +39,5 @@ fprintf (stderr, "read in parameters\n"); - gaussdev_init (); + ohana_gaussdev_init (); read_datafiles (); @@ -384,6 +384,6 @@ Ngood = 1.0; for (k = 0; k < NTRY; k++) { - v = gaussdev_rnd (Mag, Noise); - uv = gaussdev_rnd (Color, 1.4*Noise); + v = ohana_gaussdev_rnd (Mag, Noise); + uv = ohana_gaussdev_rnd (Color, 1.4*Noise); x = (uv - UV0 - 0.7*A_V) / DUV; y = (v - V0 - Dist - A_V) / DV; Index: trunk/Ohana/src/misc/src/magtoage.c =================================================================== --- trunk/Ohana/src/misc/src/magtoage.c (revision 39247) +++ trunk/Ohana/src/misc/src/magtoage.c (revision 39248) @@ -21,5 +21,5 @@ long A, B; - gaussdev_init(); + ohana_gaussdev_init(); lAo = 0.0; @@ -112,6 +112,6 @@ } else { - v = gaussdev_rnd (V, dV); - uv = gaussdev_rnd ((U-V), dUV); + v = ohana_gaussdev_rnd (V, dV); + uv = ohana_gaussdev_rnd ((U-V), dUV); } x = (uv - UV0 - 0.7*Av) / DUV; Index: trunk/Ohana/src/misc/src/magtomass.c =================================================================== --- trunk/Ohana/src/misc/src/magtomass.c (revision 39247) +++ trunk/Ohana/src/misc/src/magtomass.c (revision 39248) @@ -41,5 +41,5 @@ fprintf (stderr, "using mags in columns %d & %d\n", col1, col2); - gaussdev_init (); + ohana_gaussdev_init (); lAo = 0.1; @@ -136,6 +136,6 @@ Ngood = 1.0; for (k = 0; k < Ntry; k++) { - v = gaussdev_rnd (V, dV); - uv = gaussdev_rnd ((U-V), dUV); + v = ohana_gaussdev_rnd (V, dV); + uv = ohana_gaussdev_rnd ((U-V), dUV); x = (uv - UV0 - 0.7*Av) / DUV; y = (v - d - V0 - Av) / DV; Index: trunk/Ohana/src/misc/src/mkgauss.c =================================================================== --- trunk/Ohana/src/misc/src/mkgauss.c (revision 39247) +++ trunk/Ohana/src/misc/src/mkgauss.c (revision 39248) @@ -15,8 +15,8 @@ Npts = atoi (argv[3]); - gaussdev_init (); + ohana_gaussdev_init (); for (i = 0; i < Npts; i++) { - f = gaussdev_rnd (mean, sigma); + f = ohana_gaussdev_rnd (mean, sigma); fprintf (stdout, "%f\n", f); } Index: trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c (revision 39247) +++ trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c (revision 39248) @@ -17,7 +17,7 @@ ResetVector (vec, OPIHI_FLT, Npts); - gaussdev_init (); + ohana_gaussdev_init (); for (i = 0; i < Npts; i++) { - vec[0].elements.Flt[i] = gaussdev_rnd (mean, sigma); + vec[0].elements.Flt[i] = ohana_gaussdev_rnd (mean, sigma); } return (TRUE); @@ -48,5 +48,5 @@ ResetVector (vec, OPIHI_FLT, Npts); - gaussdev_init (); + ohana_gaussdev_init (); for (i = 0; i < Npts; i++) { vec[0].elements.Flt[i] = gaussian_int (i); Index: trunk/Ohana/src/opihi/mana/simsignal.c =================================================================== --- trunk/Ohana/src/opihi/mana/simsignal.c (revision 39247) +++ trunk/Ohana/src/opihi/mana/simsignal.c (revision 39248) @@ -27,5 +27,5 @@ ivalue = scale * 0.5 * (sin (i*2*M_PI/period) + 1) + 0.5; /* - dvalue = gaussdev_rnd (cvalue, sigma); + dvalue = ohana_gaussdev_rnd (cvalue, sigma); cvalue = (dvalue + range) / (2.0*range); dvalue = MAX (0, MIN (0.99999, cvalue)); @@ -43,5 +43,5 @@ 8 bit = 2^8 - gaussdev_init (); + ohana_gaussdev_init (); sigma = 2.0 / SN; range = 1 + 5*sigma; Index: trunk/Ohana/src/relastro/src/fitpm.c =================================================================== --- trunk/Ohana/src/relastro/src/fitpm.c (revision 39247) +++ trunk/Ohana/src/relastro/src/fitpm.c (revision 39248) @@ -65,5 +65,5 @@ } - gaussdev_init (); + ohana_gaussdev_init (); FitStats *fitStats = FitStatsInit (N_POINTS + N_OUTLIERS, N_BOOTSTRAP); @@ -154,5 +154,5 @@ } // return exit_status(); - gaussdev_free(); + ohana_gaussdev_free(); exit (0); @@ -176,6 +176,6 @@ ParFactor (&pR, &pD, Ro, Do, points[i].T); - double dR = gaussdev_rnd(0.0, POS_ERROR); - double dD = gaussdev_rnd(0.0, POS_ERROR); + double dR = ohana_gaussdev_rnd(0.0, POS_ERROR); + double dD = ohana_gaussdev_rnd(0.0, POS_ERROR); points[i].R = Ro + (dR + plx*pR + uR*(points[i].T - MJD_REF_YRS))/3600/dcos(Do);