--- ray/src/util/klems_quarter.cal	2014/07/19 00:30:03	1.2
+++ ray/src/util/klems_quarter.cal	2014/07/21 15:59:47	1.4
@@ -1,4 +1,4 @@
-{ RCSid $Id: klems_quarter.cal,v 1.2 2014/07/19 00:30:03 greg Exp $ }
+{ RCSid $Id: klems_quarter.cal,v 1.4 2014/07/21 15:59:47 greg Exp $ }
 {
 	Compute interior bin for quarter Klems BSDF basis (0-40)
 	Returns -1 for wrong-side rays
@@ -13,7 +13,7 @@ posangle(a) : if(-a, a + 2*PI, a) / DEGREE;
 Atan2(y,x) : posangle(atan2(y,x));
 
 kqpola(r) : select(r, 9, 27, 46, 66, 90);
-kqnaz(r) : select(r, 1, 88, 12, 12, 8);
+kqnaz(r) : select(r, 1, 8, 12, 12, 8);
 kqaccum(r) : if(r-.5, kqnaz(r) + kqaccum(r-1), 0);
 kqfindrow(r, pol) : if(r-kqpola(0)+.5, r,
 		if(pol-kqpola(r), kqfindrow(r+1, pol), r) );
@@ -30,7 +30,7 @@ kqbin2(pol,azi) = if(pol-90, -1,
 	) );
 
 kqbin(Nx,Ny,Nz,Ux,Uy,Uz) = kqbin2(Acos(-Dx*Nx-Dy*Ny-Dz*Nz),
-	Atan2(-Dx*Ux-Dy*Uy-Dz*Uz,
+	Atan2(-Dx*Ux-Dy*Uy-Dz*Uz + (Nx*Dx+Ny*Dy+Nz*Dz)*(Nx*Ux+Ny*Uy+Nz*Uz),
 		-Dx*(Uy*Nz-Uz*Ny) - Dy*(Uz*Nx-Ux*Nz) - Dz*(Ux*Ny-Uy*Nx)));
 				
 Nkqbins : kqaccum(kqnaz(0));	{ Number of bins for one elevation }