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

Comparing ray/src/cal/cal/normcomp.cal (file contents):
Revision 1.4 by greg, Sun Sep 12 17:04:41 2021 UTC vs.
Revision 1.5 by greg, Mon Sep 13 16:40:32 2021 UTC

# Line 34 | Line 34 | den = s1*s1 - s2*s2;
34   c0 = (m2*s1*s1 - m1*s2*s2)/den;
35   cr = s1*s2*sqrt((m1-m2)*(m1-m2) + 2*den*log(s1/s2))/den;
36  
37 < NormOverlap = if(1e-7 - abs(s1-s2), 1 - erf(abs(m1-m2)/(s1+s2)/sqrt(2)),
37 > NormOverlap = if(1e-7 - abs(s1-s2), erfc(abs(m1-m2)/(s1+s2)/sqrt(2)),
38                  1 - Finteg(c0-cr,m1,s1) + Finteg(c0-cr,m2,s2)
39                          + Finteg(c0+cr,m1,s1) - Finteg(c0+cr,m2,s2) );

Diff Legend

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