ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/klems_half.cal
(Generate patch)

Comparing ray/src/util/klems_half.cal (file contents):
Revision 1.1 by greg, Sat Jul 19 00:28:38 2014 UTC vs.
Revision 1.4 by greg, Sun Aug 26 05:33:46 2018 UTC

# Line 28 | Line 28 | khbin2(pol,azi) = if(pol-90, -1,
28                  khaccum(3) + khazn(azi,360/khnaz(4)),
29                  khaccum(4) + khazn(azi,360/khnaz(5)),
30                  khaccum(5) + khazn(azi,360/khnaz(6)),
31 <                khaccum(6) + khazn(azi,360/khnaz(7)),
32 <                khaccum(7) + khazn(azi,360/khnaz(8))
31 >                khaccum(6) + khazn(azi,360/khnaz(7))
32          ) );
33  
34 + RHS = 1;        { set to -1 for left-handed system }
35 +
36   khbin(Nx,Ny,Nz,Ux,Uy,Uz) = khbin2(Acos(-Dx*Nx-Dy*Ny-Dz*Nz),
37 <        Atan2(-Dx*Ux-Dy*Uy-Dz*Uz,
38 <                -Dx*(Uy*Nz-Uz*Ny) - Dy*(Uz*Nx-Ux*Nz) - Dz*(Ux*Ny-Uy*Nx)));
37 >        Atan2(-Dx*Ux-Dy*Uy-Dz*Uz + (Nx*Dx+Ny*Dy+Nz*Dz)*(Nx*Ux+Ny*Uy+Nz*Uz),
38 >                -RHS*(Dx*(Uy*Nz-Uz*Ny) + Dy*(Uz*Nx-Ux*Nz) + Dz*(Ux*Ny-Uy*Nx))));
39                                  
40   Nkhbins : khaccum(khnaz(0));    { Number of bins for one elevation }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines