--- ray/src/util/klems_quarter.cal	2014/07/19 00:28:38	1.1
+++ ray/src/util/klems_quarter.cal	2015/03/27 18:58:06	1.5
@@ -1,6 +1,6 @@
-{ RCSid $Id: klems_quarter.cal,v 1.1 2014/07/19 00:28:38 greg Exp $ }
+{ RCSid $Id: klems_quarter.cal,v 1.5 2015/03/27 18:58:06 greg Exp $ }
 {
-	Compute interior bin for half Klems BSDF basis (0-72)
+	Compute interior bin for quarter Klems BSDF basis (0-40)
 	Returns -1 for wrong-side rays
 
 	Modified from klems_full.cal
@@ -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) );
@@ -29,8 +29,10 @@ kqbin2(pol,azi) = if(pol-90, -1,
 		kqaccum(4) + kqazn(azi,360/kqnaz(5))
 	) );
 
+RHS = 1;	{ set to -1 for left-handed system }
+
 kqbin(Nx,Ny,Nz,Ux,Uy,Uz) = kqbin2(Acos(-Dx*Nx-Dy*Ny-Dz*Nz),
-	Atan2(-Dx*Ux-Dy*Uy-Dz*Uz,
-		-Dx*(Uy*Nz-Uz*Ny) - Dy*(Uz*Nx-Ux*Nz) - Dz*(Ux*Ny-Uy*Nx)));
+	Atan2(-Dx*Ux-Dy*Uy-Dz*Uz + (Nx*Dx+Ny*Dy+Nz*Dz)*(Nx*Ux+Ny*Uy+Nz*Uz),
+		-RHS*(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 }