--- ray/src/util/genBSDF.pl	2011/06/01 22:50:24	2.18
+++ ray/src/util/genBSDF.pl	2011/06/24 19:07:38	2.23
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.18 2011/06/01 22:50:24 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.23 2011/06/24 19:07:38 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;
@@ -22,6 +23,7 @@ my $geout = 1;
 my $nproc = 1;
 my $doforw = 0;
 my $doback = 1;
+my $gunit = "Meter";
 my @dim;
 # Get options
 while ($#ARGV >= 0) {
@@ -32,6 +34,11 @@ while ($#ARGV >= 0) {
 		shift @ARGV;
 	} elsif ("$ARGV[0]" =~ /^[-+]g/) {
 		$geout = ("$ARGV[0]" =~ /^\+/);
+		$gunit = $ARGV[1];
+		if ($gunit !~ /^(?i)(meter|foot|inch|centimeter|millimeter)$/) {
+			die "Illegal geometry unit '$gunit': must be meter, foot, inch, centimeter, or millimeter\n";
+		}
+		shift @ARGV;
 	} elsif ("$ARGV[0]" =~ /^[-+]f/) {
 		$doforw = ("$ARGV[0]" =~ /^\+/);
 	} elsif ("$ARGV[0]" =~ /^[-+]b/) {
@@ -98,20 +105,23 @@ 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>
 		<Name>Name</Name>
 		<Manufacturer>Manufacturer</Manufacturer>
 ';
-printf "\t\t<Thickness unit=\"Meter\">%.3f</Thickness>\n", $dim[5] - $dim[4];
-printf "\t\t<Width unit=\"Meter\">%.3f</Width>\n", $dim[1] - $dim[0];
-printf "\t\t<Height unit=\"Meter\">%.3f</Height>\n", $dim[3] - $dim[2];
+printf "\t\t<Thickness unit=\"$gunit\">%.3f</Thickness>\n", $dim[5] - $dim[4];
+printf "\t\t<Width unit=\"$gunit\">%.3f</Width>\n", $dim[1] - $dim[0];
+printf "\t\t<Height unit=\"$gunit\">%.3f</Height>\n", $dim[3] - $dim[2];
 print "\t\t<DeviceType>Integral</DeviceType>\n";
 # Output MGF description if requested
 if ( $geout ) {
-	print "\t\t<Geometry format=\"MGF\" unit=\"Meter\">\n";
+	print "\t\t<Geometry format=\"MGF\" unit=\"$gunit\">\n";
 	printf "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
 	open(MGFSCN, "< $mgfscn");
 	while (<MGFSCN>) { print $_; }
@@ -156,9 +166,13 @@ sub do_tree_bsdf {
 # Get sampling rate and subdivide task
 my $ns2 = $ns;
 $ns2 /= 2 if ( $tensortree == 3 );
-@pdiv = (0, int($ns2/$nproc));
-my $nrem = $ns2 % $nproc;
-for (my $i = 1; $i < $nproc; $i++) {
+my $nsplice = $nproc;
+$nsplice *= 10 if ($nproc > 1);
+$nsplice = $ns2 if ($nsplice > $ns2);
+$nsplice = 999 if ($nsplice > 999);
+@pdiv = (0, int($ns2/$nsplice));
+my $nrem = $ns2 % $nsplice;
+for (my $i = 1; $i < $nsplice; $i++) {
 	my $nv = $pdiv[$i] + $pdiv[1];
 	++$nv if ( $nrem-- > 0 );
 	push @pdiv, $nv;
@@ -207,27 +221,42 @@ print "\t<DataDefinition>\n";
 print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
 print "\t</DataDefinition>\n";
 # Fork parallel rtcontrib processes to compute each side
+my $npleft = $nproc;
 if ( $doback ) {
-	for (my $proc = 0; $proc < $nproc; $proc++) {
-		bg_tree_rtcontrib(0, $proc);
+	for (my $splice = 0; $splice < $nsplice; $splice++) {
+		if (! $npleft ) {
+			wait();
+			die "rtcontrib process reported error" if ( $? );
+			$npleft++;
+		}
+		bg_tree_rtcontrib(0, $splice);
+		$npleft--;
 	}
 	while (wait() >= 0) {
 		die "rtcontrib process reported error" if ( $? );
+		$npleft++;
 	}
 	ttree_out(0);
 }
 if ( $doforw ) {
-	for (my $proc = 0; $proc < $nproc; $proc++) {
-		bg_tree_rtcontrib(1, $proc);
+	for (my $splice = 0; $splice < $nsplice; $splice++) {
+		if (! $npleft ) {
+			wait();
+			die "rtcontrib process reported error" if ( $? );
+			$npleft++;
+		}
+		bg_tree_rtcontrib(1, $splice);
+		$npleft--;
 	}
 	while (wait() >= 0) {
 		die "rtcontrib process reported error" if ( $? );
+		$npleft++;
 	}
 	ttree_out(1);
 }
 }	# end of sub do_tree_bsdf()
 
-# Run i'th rtcontrib process for generating tensor tree samples
+# Run rtcontrib process in background to generate tensor tree samples
 sub bg_tree_rtcontrib {
 	my $pid = fork();
 	die "Cannot fork new process" unless defined $pid;
@@ -317,8 +346,8 @@ print
 		<WavelengthDataBlock>
 ';
 print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
-print '
-			<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
+print
+'			<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
 			<ScatteringDataType>BRDF</ScatteringDataType>
 			<ScatteringData>
 ';
@@ -398,7 +427,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]' " .