--- ray/src/util/genBSDF.pl	2012/09/10 18:06:08	2.39
+++ ray/src/util/genBSDF.pl	2014/04/07 21:33:25	2.46
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.39 2012/09/10 18:06:08 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.46 2014/04/07 21:33:25 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
@@ -24,7 +24,7 @@ my $nproc = 1;
 my $doforw = 0;
 my $doback = 1;
 my $pctcull = 90;
-my $gunit = "Meter";
+my $gunit = "meter";
 my @dim;
 # Get options
 while ($#ARGV >= 0) {
@@ -108,6 +108,7 @@ print
 print "<!-- File produced by: genBSDF @savedARGV -->\n";
 print
 '<WindowElementType>System</WindowElementType>
+<FileType>BSDF</FileType>
 <Optical>
 <Layer>
 	<Material>
@@ -117,21 +118,23 @@ print
 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";
+print "\t\t<DeviceType>Other</DeviceType>\n";
+print "	</Material>\n";
 # Output MGF description if requested
 if ( $geout ) {
-	print "\t\t<Geometry format=\"MGF\" unit=\"$gunit\">\n";
+	print "\t<Geometry format=\"MGF\">\n";
+	print "\t\t<MGFblock 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 $_; }
 	close MGFSCN;
 	print "xf\n";
-	print "\t\t</Geometry>\n";
+	print "</MGFblock>\n";
+	print "\t</Geometry>\n";
 }
-print "	</Material>\n";
 # Set up surface sampling
-my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + .5);
-my $ny = int($nsamp/$nx + .5);
+my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
+my $ny = int($nsamp/$nx + 1);
 $nsamp = $nx * $ny;
 my $ns = 2**$ttlog2;
 my (@pdiv, $disk2sq, $sq2disk, $tcal, $kcal);
@@ -178,7 +181,7 @@ $disk2sq = '
 norm_radians(p) : if(-p - PI/4, p + 2*PI, p);
 in_disk_r = .999995*sqrt(Dx*Dx + Dy*Dy);
 in_disk_phi = norm_radians(atan2(Dy, Dx));
-in_disk_rgn = floor((in_disk_phi + PI/4)/(PI/2)) + 1;
+in_disk_rgn = floor((.999995*in_disk_phi + PI/4)/(PI/2)) + 1;
 out_square_a = select(in_disk_rgn,
 			in_disk_r,
 			(PI/2 - in_disk_phi)*in_disk_r/(PI/4),
@@ -274,7 +277,8 @@ $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
 	q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
 if ($pctcull >= 0) {
 	$cmd .= "-of $td/" . ($bmodnm,$fmodnm)[$forw] . ".flt " .
-	"| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
+	"| rttree_reduce -h -ff -t $pctcull -r $tensortree -g $ttlog2";
+	$cmd .= " -a" if ($tensortree == 3);
 	system "$cmd" || die "Failure running rttree_reduce";
 } else {
 	$cmd .= "$td/" . ($bmodnm,$fmodnm)[$forw] . ".flt";
@@ -303,7 +307,7 @@ print
 print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
 print
 '			<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
-			<ScatteringDataType>BRDF</ScatteringDataType>
+			<ScatteringDataType>BTDF</ScatteringDataType>
 			<ScatteringData>
 ';
 $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
@@ -540,7 +544,7 @@ print
 			<WavelengthDataDirection>Reflection Front</WavelengthDataDirection>
 			<ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
 			<RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
-			<ScatteringDataType>BRDF</ScatteringDataType>
+			<ScatteringDataType>BTDF</ScatteringDataType>
 			<ScatteringData>
 ';
 # Output front reflection (transposed order)
@@ -590,7 +594,7 @@ print
 			<WavelengthDataDirection>Reflection Back</WavelengthDataDirection>
 			<ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
 			<RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
-			<ScatteringDataType>BRDF</ScatteringDataType>
+			<ScatteringDataType>BTDF</ScatteringDataType>
 			<ScatteringData>
 ';
 # Output back reflection (transposed order)