--- ray/src/cal/cal/klems_int.cal	2011/01/26 23:42:03	1.5
+++ ray/src/cal/cal/klems_int.cal	2011/04/11 03:47:46	1.6
@@ -1,4 +1,4 @@
-{ RCSid $Id: klems_int.cal,v 1.5 2011/01/26 23:42:03 greg Exp $ }
+{ RCSid $Id: klems_int.cal,v 1.6 2011/04/11 03:47:46 greg Exp $ }
 {
 	Compute interior bin for (full) Klems BSDF basis (0-144)
 
@@ -7,9 +7,9 @@
 	6/14/2009	G. Ward
 }
 DEGREE : PI/180;
-Acos(x) : 1/DEGREE * if(x-1, 0, if(-1-x, 0, acos(x)));
-posangle(a) : if(-a, a + 2*PI, a);
-Atan2(y,x) : 1/DEGREE * posangle(atan2(y,x));
+Acos(x) : if(x-1, 0, if(-1-x, 0, acos(x))) / DEGREE;
+posangle(a) : if(-a, a + 2*PI, a) / DEGREE;
+Atan2(y,x) : posangle(atan2(y,x));
 
 kpola(r) : select(r, 5, 15, 25, 35, 45, 55, 65, 75, 90);
 knaz(r) : select(r, 1, 8, 16, 20, 24, 24, 24, 16, 12);
@@ -33,7 +33,7 @@ kbin2(pol,azi) = select(kfindrow(1, pol),
 
 kbin(Nx,Ny,Nz,Ux,Uy,Uz) = kbin2(Acos(-Dx*Nx-Dy*Ny-Dz*Nz),
 	Atan2(-Dx*Ux-Dy*Uy-Dz*Uz,
-		-Dx*(Ny*Uz-Nz*Uy) - Dy*(Nz*Ux-Nx*Uz) - Dz*(Nx*Uy-Ny*Ux)));
+		-Dx*(Uy*Nz-Uz*Ny) - Dy*(Uz*Nx-Ux*Nz) - Dz*(Ux*Ny-Uy*Nx)));
 				
 kbinN = kbin(0,-1,0, 0,0,1);	{ North bins }
 kbinE = kbin(-1,0,0, 0,0,1);	{ East bins }