--- ray/src/util/genBSDF.pl	2015/03/25 19:18:28	2.53
+++ ray/src/util/genBSDF.pl	2015/03/25 22:50:48	2.54
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.53 2015/03/25 19:18:28 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.54 2015/03/25 22:50:48 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
@@ -328,15 +328,13 @@ sub ttree_comp {
 				qq{-e "$CIEuv" } .
 				q{-e "$1=Yi/Omega"};
 		} elsif ("$spec" eq "CIE-u") {
-			$cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } .
-				q{-e "Ri=$1;Gi=$2;Bi=$3" } .
+			$cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
 				qq{-e "$CIEuv" } .
-				q{-e "$1=uprime/Omega"};
+				q{-e "$1=uprime"};
 		} elsif ("$spec" eq "CIE-v") {
-			$cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } .
-				q{-e "Ri=$1;Gi=$2;Bi=$3" } .
+			$cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
 				qq{-e "$CIEuv" } .
-				q{-e "$1=vprime/Omega"};
+				q{-e "$1=vprime"};
 		}
 	} else {
 		if ("$spec" eq "Visible") {
@@ -345,15 +343,13 @@ sub ttree_comp {
 				"-e '$CIEuv' " .
 				q{-e '$1=Yi/Omega'};
 		} elsif ("$spec" eq "CIE-u") {
-			$cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
-				q{-e 'Ri=$1;Gi=$2;Bi=$3' } .
+			$cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
 				"-e '$CIEuv' " .
-				q{-e '$1=uprime/Omega'};
+				q{-e '$1=uprime'};
 		} elsif ("$spec" eq "CIE-v") {
-			$cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
-				q{-e 'Ri=$1;Gi=$2;Bi=$3' } .
+			$cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
 				"-e '$CIEuv' " .
-				q{-e '$1=vprime/Omega'};
+				q{-e '$1=vprime'};
 		}
 	}
 	if ($pctcull >= 0) {