--- ray/src/cal/cal/cieresp.cal 2003/02/22 02:07:21 1.1 +++ ray/src/cal/cal/cieresp.cal 2005/04/28 23:58:06 1.2 @@ -1,3 +1,4 @@ +{ RCSid $Id: cieresp.cal,v 1.2 2005/04/28 23:58:06 greg Exp $ } { CIE standard response curves. @@ -6,9 +7,9 @@ LEmax : 683; { maximum luminous efficacy } -photopic(i) = LEmax * triy(i); +photopic(i) : LEmax * triy(i); -scotopic(x)= if(380-x,0,if(x-780,0, +scotopic(x): if(380-x,0,if(x-780,0, LEmax/.402 * select(x-379,0.000598,0.000665,0.000752,0.000854, 0.000972,0.001108,0.001268,0.001453,0.001668,0.001918,0.002209, 0.002547,0.002939,0.003394,0.003921,0.00453,0.00524,0.00605, @@ -63,7 +64,7 @@ LEmax/.402 * select(x-379,0.000598,0.000665,0.000752,0 1.932e-07,1.829e-07,1.731e-07,1.638e-07,1.551e-07,1.468e-07, 1.39e-07))); -trix(x)=select(x-359,0.0001299,0.000145847,0.0001638021, +trix(x):select(x-359,0.0001299,0.000145847,0.0001638021, 0.0001840037,0.0002066902,0.0002321,0.000260728,0.000293075, 0.000329388,0.000369914,0.0004149,0.0004641587,0.000518986, 0.000581854,0.0006552347,0.0007416,0.0008450296,0.0009645268, @@ -153,7 +154,7 @@ trix(x)=select(x-359,0.0001299,0.000145847,0.000163802 1.656215e-06,1.544022e-06,1.43944e-06,1.341977e-06, 1.251141e-06); -triy(x)=select(x-359,3.917e-06,4.393581e-06,4.929604e-06, +triy(x):select(x-359,3.917e-06,4.393581e-06,4.929604e-06, 5.532136e-06,6.208245e-06,6.965e-06,7.813219e-06,8.767336e-06, 9.839844e-06,1.104323e-05,1.239e-05,1.388641e-05,1.555728e-05, 1.744296e-05,1.958375e-05,2.202e-05,2.483965e-05,2.804126e-05, @@ -238,7 +239,7 @@ triy(x)=select(x-359,3.917e-06,4.393581e-06,4.929604e- 8.492513e-07,7.917212e-07,7.380904e-07,6.881098e-07,6.4153e-07, 5.980895e-07,5.575746e-07,5.19808e-07,4.846123e-07,4.5181e-07); -triz(x)=select(x-359,0.0006061,0.0006808792,0.0007651456, +triz(x):select(x-359,0.0006061,0.0006808792,0.0007651456, 0.0008600124,0.0009665928,0.001086,0.001220586,0.001372729, 0.001543579,0.001734286,0.001946,0.002177777,0.002435809, 0.002731953,0.003078064,0.003486,0.003975227,0.00454088,