--- ray/src/cv/bsdf2klems.c	2013/04/25 03:14:52	2.5
+++ ray/src/cv/bsdf2klems.c	2013/11/21 20:09:06	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf2klems.c,v 2.5 2013/04/25 03:14:52 greg Exp $";
+static const char RCSid[] = "$Id: bsdf2klems.c,v 2.12 2013/11/21 20:09:06 greg Exp $";
 #endif
 /*
  * Load measured BSDF interpolant and write out as XML file with Klems matrix.
@@ -25,6 +25,8 @@ char			*progname;
 static const char	*kbasis = "LBNL/Klems Full";
 				/* number of BSDF samples per patch */
 static int		npsamps = 256;
+				/* limit on number of RBF lobes */
+static int		lobe_lim = 15000;
 
 /* Return angle basis corresponding to the given name */
 ANGLE_BASIS *
@@ -56,8 +58,10 @@ xml_header(int ac, char *av[])
 static void
 xml_prologue(const SDData *sd)
 {
-	const char	*matn = (sd && sd->matn[0]) ? sd->matn : "Name";
-	const char	*makr = (sd && sd->makr[0]) ? sd->makr : "Manufacturer";
+	const char	*matn = (sd && sd->matn[0]) ? sd->matn :
+				bsdf_name[0] ? bsdf_name : "Unknown";
+	const char	*makr = (sd && sd->makr[0]) ? sd->makr :
+				bsdf_manuf[0] ? bsdf_manuf : "Unknown";
 	ANGLE_BASIS	*abp = get_basis(kbasis);
 	int		i;
 
@@ -229,12 +233,12 @@ eval_bsdf(const char *fname)
 	    data_epilogue();
 	}
 						/* back transmission */
-	if (bsd.tb != NULL) {
+	if ((bsd.tb != NULL) | (bsd.tf != NULL)) {
 	    input_orient = -1; output_orient = 1;
 	    data_prologue();
 	    for (j = 0; j < abp->nangles; j++) {
 	        for (i = 0; i < abp->nangles; i++) {
-		    sum = 0;			/* average over patches */
+		    sum = 0;		/* average over patches */
 		    for (n = npsamps; n-- > 0; ) {
 			fo_getvec(vout, j+(n+frandom())/npsamps, abp);
 			bi_getvec(vin, i+urand(n), abp);
@@ -261,6 +265,7 @@ static void
 eval_function(char *funame)
 {
 	ANGLE_BASIS	*abp = get_basis(kbasis);
+	int		assignD = (fundefined(funame) < 6);
 	double		iovec[6];
 	double		sum;
 	int		i, j, n;
@@ -281,6 +286,12 @@ eval_function(char *funame)
 		    else
 			bi_getvec(iovec, i+urand(n), abp);
 
+		    if (assignD) {
+			varset("Dx", '=', -iovec[3]);
+			varset("Dy", '=', -iovec[4]);
+			varset("Dz", '=', -iovec[5]);
+			++eclock;
+		    }
 		    sum += funvalue(funame, 6, iovec);
 		}
 		printf("\t%.3e\n", sum/npsamps);
@@ -312,7 +323,7 @@ eval_rbf(void)
 	    else
 		bi_getvec(vin, i+.5*(i>0), abp);
 
-	    rbf = advect_rbf(vin);		/* compute radial basis func */
+	    rbf = advect_rbf(vin, lobe_lim);	/* compute radial basis func */
 
 	    for (j = 0; j < abp->nangles; j++) {
 	        sum = 0;			/* sample over exiting patch */
@@ -322,10 +333,13 @@ eval_rbf(void)
 		    else
 			bo_getvec(vout, j+(n+frandom())/npsamps, abp);
 
-		    sum += eval_rbfrep(rbf, vout) / vout[2];
+		    sum += eval_rbfrep(rbf, vout);
 		}
-		bsdfarr[j*abp->nangles + i] = sum*output_orient/npsamps;
+		fo_getvec(vout, j+.5, abp);	/* use centered secant */
+		bsdfarr[j*abp->nangles + i] = sum / (npsamps*vout[2]);
 	    }
+	    if (rbf != NULL)
+		free(rbf);
 	}
 	n = 0;					/* write out our matrix */
 	for (j = 0; j < abp->nangles; j++) {
@@ -376,6 +390,9 @@ main(int argc, char *argv[])
 		case 'q':
 			kbasis = "LBNL/Klems Quarter";
 			break;
+		case 'l':
+			lobe_lim = atoi(argv[++i]);
+			break;
 		default:
 			goto userr;
 		}
@@ -384,8 +401,11 @@ main(int argc, char *argv[])
 			fprintf(stderr,
 	"%s: need single function with 6 arguments: bsdf(ix,iy,iz,ox,oy,oz)\n",
 					progname);
+			fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n",
+					progname);
 			goto userr;
 		}
+		++eclock;
 		xml_header(argc, argv);			/* start XML output */
 		xml_prologue(NULL);
 		if (dofwd) {
@@ -444,7 +464,7 @@ main(int argc, char *argv[])
 	return(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-n spp][-h|-q][bsdf.sir ..] > bsdf.xml\n", progname);
+	"Usage: %s [-n spp][-h|-q][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", progname);
 	fprintf(stderr,
 	"   or: %s [-n spp][-h|-q] bsdf_in.xml > bsdf_out.xml\n", progname);
 	fprintf(stderr,