--- ray/src/cv/bsdf2ttree.c	2013/10/03 17:01:02	2.19
+++ ray/src/cv/bsdf2ttree.c	2013/11/26 17:35:59	2.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.19 2013/10/03 17:01:02 greg Exp $";
+static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.23 2013/11/26 17:35:59 greg Exp $";
 #endif
 /*
  * Load measured BSDF interpolant and write out as XML file with tensor tree.
@@ -11,7 +11,9 @@ static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.19 
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include "random.h"
 #include "platform.h"
+#include "rtprocess.h"
 #include "calcomp.h"
 #include "bsdfrep.h"
 				/* global argv[0] */
@@ -44,8 +46,9 @@ xml_prologue(int ac, char *av[])
 	puts("<Optical>");
 	puts("<Layer>");
 	puts("\t<Material>");
-	puts("\t\t<Name>Name</Name>");
-	puts("\t\t<Manufacturer>Manufacturer</Manufacturer>");
+	printf("\t\t<Name>%s</Name>\n", bsdf_name[0] ? bsdf_name : "Unknown");
+	printf("\t\t<Manufacturer>%s</Manufacturer>\n",
+			bsdf_manuf[0] ? bsdf_manuf : "Unknown");
 	puts("\t\t<DeviceType>Other</DeviceType>");
 	puts("\t</Material>");
 	puts("\t<DataDefinition>");
@@ -122,8 +125,7 @@ eval_isotropic(char *funame)
 
 	data_prologue();			/* begin output */
 	if (pctcull >= 0) {
-		sprintf(cmd, "rttree_reduce%s -h -ff -r 3 -t %f -g %d",
-				(input_orient>0 ^ output_orient>0) ? "" : " -a",
+		sprintf(cmd, "rttree_reduce -a -h -ff -r 3 -t %f -g %d",
 				pctcull, samp_order);
 		fflush(stdout);
 		ofp = popen(cmd, "w");
@@ -168,7 +170,7 @@ eval_isotropic(char *funame)
 			    if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) {
 				sum = 0;	/* super-sample voxel */
 				for (ssi = nssamp; ssi--; ) {
-				    SDmultiSamp(ssa, 3, (ssi+drand48())/nssamp);
+				    SDmultiSamp(ssa, 3, (ssi+frandom())/nssamp);
 				    ssvec[0] = 2.*(ix+ssa[0])/sqres - 1.;
 				    ssvec[1] = .0;
 				    ssvec[2] = input_orient *
@@ -273,7 +275,7 @@ eval_anisotropic(char *funame)
 			    if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) {
 				sum = 0;	/* super-sample voxel */
 				for (ssi = nssamp; ssi--; ) {
-				    SDmultiSamp(ssa, 4, (ssi+drand48())/nssamp);
+				    SDmultiSamp(ssa, 4, (ssi+frandom())/nssamp);
 				    SDsquare2disk(ssvec, 1.-(ix+ssa[0])/sqres,
 						1.-(iy+ssa[1])/sqres);
 				    ssvec[2] = output_orient *