--- ray/src/util/genBSDF.pl	2011/05/25 19:24:11	2.15
+++ ray/src/util/genBSDF.pl	2011/06/08 23:16:47	2.21
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.15 2011/05/25 19:24:11 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.21 2011/06/08 23:16:47 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
@@ -13,6 +13,7 @@ sub userror {
 }
 my $td = mkdtemp("/tmp/genBSDF.XXXXXX");
 chomp $td;
+my @savedARGV = @ARGV;
 my $tensortree = 0;
 my $ttlog2 = 4;
 my $nsamp = 1000;
@@ -98,7 +99,10 @@ die "Could not compile scene\n" if ( $? );
 print
 '<?xml version="1.0" encoding="UTF-8"?>
 <WindowElement xmlns="http://windows.lbl.gov" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windows.lbl.gov/BSDF-v1.4.xsd">
-<WindowElementType>System</WindowElementType>
+';
+print "<!-- File produced by: genBSDF @savedARGV -->\n";
+print
+'<WindowElementType>System</WindowElementType>
 <Optical>
 <Layer>
 	<Material>
@@ -139,8 +143,7 @@ print
 </WindowElement>
 ';
 # Clean up temporary files and exit
-if ( $persistfile ) {
-	open(PFI, "< $persistfile");
+if ( $persistfile && open(PFI, "< $persistfile") ) {
 	while (<PFI>) {
 		s/^[^ ]* //;
 		kill('ALRM', $_);
@@ -148,8 +151,8 @@ if ( $persistfile ) {
 	}
 	close PFI;
 }
-system "rm -rf $td";
-exit 0;
+exec("rm -rf $td");
+
 #-------------- End of main program segment --------------#
 
 #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
@@ -204,9 +207,9 @@ out_square_x = (out_square_a + 1)/2;
 out_square_y = (out_square_b + 1)/2;
 ';
 # Announce ourselves in XML output
-print "		<DataDefinition>\n";
-print "			<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
-print "		</DataDefinition>\n";
+print "\t<DataDefinition>\n";
+print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
+print "\t</DataDefinition>\n";
 # Fork parallel rtcontrib processes to compute each side
 if ( $doback ) {
 	for (my $proc = 0; $proc < $nproc; $proc++) {
@@ -249,7 +252,7 @@ sub bg_tree_rtcontrib {
 			"| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
 			"-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
 			"-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
-			"-e 'Dx=1-($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
+			"-e 'Dx=1-2*($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
 			"-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
 			"-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
 			"-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
@@ -316,8 +319,10 @@ print
 		<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
 		<DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
 		<WavelengthDataBlock>
-			<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>
-			<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
+';
+print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
+print
+'			<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
 			<ScatteringDataType>BRDF</ScatteringDataType>
 			<ScatteringData>
 ';
@@ -397,7 +402,8 @@ my $rtcmd = "rtcontrib $rtargs -h -ff -fo -n $nproc -c
 	"-o '$td/%s.flt' -m $fmodnm -m $bmodnm $octree";
 my $rccmd = "rcalc -e '$tcal' " .
 	"-e 'mod(n,d):n-floor(n/d)*d' -e 'Kbin=mod(recno-.999,$ndiv)' " .
-	q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega'};
+	q{-if3 -e 'oval=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega' } .
+	q[-o '${  oval  },'];
 if ( $doforw ) {
 $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
 	"-e 'xp=(\$3+rand(.12*recno+288))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .