--- ray/src/cv/bsdf2klems.c	2013/08/02 20:56:19	2.8
+++ 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.8 2013/08/02 20:56:19 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;
 
@@ -154,7 +158,6 @@ static void
 eval_bsdf(const char *fname)
 {
 	ANGLE_BASIS	*abp = get_basis(kbasis);
-	float		*trans_mtx = NULL;
 	SDData		bsd;
 	SDError		ec;
 	FVECT		vin, vout;
@@ -210,9 +213,6 @@ eval_bsdf(const char *fname)
 	}
 						/* front transmission */
 	if (bsd.tf != NULL || bsd.tLamb.cieY > .002) {
-	    if (bsd.tb == NULL)
-		trans_mtx = (float *)malloc(sizeof(float) *
-						abp->nangles*abp->nangles);
 	    input_orient = 1; output_orient = -1;
 	    data_prologue();
 	    for (j = 0; j < abp->nangles; j++) {
@@ -227,56 +227,33 @@ eval_bsdf(const char *fname)
 			sum += sv.cieY;
 		    }
 		    printf("\t%.3e\n", sum/npsamps);
-		    if (trans_mtx != NULL)
-			trans_mtx[j*abp->nangles + i] = sum/npsamps;
 		}
 		putchar('\n');			/* extra space between rows */
 	    }
 	    data_epilogue();
 	}
 						/* back transmission */
-	if (bsd.tb != NULL || trans_mtx != NULL) {
-	    if (bsd.tf == NULL)
-		trans_mtx = (float *)malloc(sizeof(float) *
-						abp->nangles*abp->nangles);
+	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++)
-		    if (bsd.tb != NULL) {	/* use tb if we have it */
-			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);
-			    ec = SDevalBSDF(&sv, vout, vin, &bsd);
-			    if (ec != SDEnone)
+	        for (i = 0; i < abp->nangles; i++) {
+		    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);
+			ec = SDevalBSDF(&sv, vout, vin, &bsd);
+			if (ec != SDEnone)
 				goto err;
-			    sum += sv.cieY;
-			}
-			printf("\t%.3e\n", sum/npsamps);
-			if (trans_mtx != NULL)
-			    trans_mtx[i*abp->nangles + j] = sum/npsamps;
-		    } else {			/* else transpose tf */
-			printf("\t%.3e\n", trans_mtx[i*abp->nangles + j]);
+			sum += sv.cieY;
 		    }
+		    printf("\t%.3e\n", sum/npsamps);
+		}
 		putchar('\n');			/* extra space between rows */
 	    }
 	    data_epilogue();
 	}
-						/* derived front transmission */
-	if (bsd.tf == NULL && trans_mtx != NULL) {
-	    input_orient = 1; output_orient = -1;
-	    data_prologue();
-	    for (j = 0; j < abp->nangles; j++) {
-	        for (i = 0; i < abp->nangles; i++)
-		    printf("\t%.3e\n", trans_mtx[j*abp->nangles + i]);
-		putchar('\n');			/* extra space between rows */
-	    }
-	    data_epilogue();
-	}
 	SDfreeBSDF(&bsd);			/* all done */
-	if (trans_mtx != NULL)
-		free(trans_mtx);
 	return;
 err:
 	SDreportError(ec, stderr);
@@ -346,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 */
@@ -356,9 +333,10 @@ 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);
@@ -412,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;
 		}
@@ -483,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,