--- ray/src/gen/mkillum2.c	1992/08/13 11:23:46	2.5
+++ ray/src/gen/mkillum2.c	1995/11/07 17:50:44	2.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -163,8 +163,8 @@ char  *nm;
 		nalt = nazi = 1;
 	else {
 		n = 4.*PI * il->sampdens;
-		nalt = sqrt(n/PI) + .5;
-		nazi = PI*nalt + .5;
+		nalt = sqrt(2./PI*n) + .5;
+		nazi = PI/2.*nalt + .5;
 	}
 	n = nalt*nazi;
 	distarr = (float *)calloc(n, 3*sizeof(float));
@@ -260,7 +260,7 @@ char  *nm;
 		    r1 = r3*cos(r2);
 		    r2 = r3*sin(r2);
 		    for (j = 0; j < 3; j++)
-			org[j] = CO_P0(co)[j] + r1*u[j] + r1*v[j] +
+			org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] +
 					.001*co->ad[j];
 
 					/* send sample */