Index: trunk/Ohana/src/addstar/src/mkcmf.c
===================================================================
--- trunk/Ohana/src/addstar/src/mkcmf.c	(revision 39242)
+++ 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);