--- ray/src/cv/bsdf2rado.c	2018/06/07 15:39:36	2.1
+++ ray/src/cv/bsdf2rado.c	2021/12/07 23:55:02	2.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf2rado.c,v 2.1 2018/06/07 15:39:36 greg Exp $";
+static const char RCSid[] = "$Id: bsdf2rado.c,v 2.5 2021/12/07 23:55:02 greg Exp $";
 #endif
 /*
  *  Plot 3-D BSDF output based on scattering interpolant or XML representation
@@ -75,9 +75,10 @@ main(int argc, char *argv[])
 			bsdf_min = myBSDF.rLambFront.cieY/M_PI;
 		if (myBSDF.rb != NULL && myBSDF.rLambBack.cieY < bsdf_min*M_PI)
 			bsdf_min = myBSDF.rLambBack.cieY/M_PI;
-		if ((myBSDF.tf != NULL) | (myBSDF.tb != NULL) &&
-				myBSDF.tLamb.cieY < bsdf_min*M_PI)
-			bsdf_min = myBSDF.tLamb.cieY/M_PI;
+		if (myBSDF.tf != NULL && myBSDF.tLambFront.cieY < bsdf_min*M_PI)
+			bsdf_min = myBSDF.tLambFront.cieY/M_PI;
+		if (myBSDF.tb != NULL && myBSDF.tLambBack.cieY < bsdf_min*M_PI)
+			bsdf_min = myBSDF.tLambBack.cieY/M_PI;
 		if (doTrans && (myBSDF.tf == NULL) & (myBSDF.tb == NULL)) {
 			fprintf(stderr, "%s: no transmitted component in '%s'\n",
 					progname, argv[1]);
@@ -95,9 +96,9 @@ main(int argc, char *argv[])
 		fclose(fp);
 	}
 #ifdef DEBUG
-	fprintf(stderr, "Minimum BSDF set to %.4f\n", bsdf_min);
+	fprintf(stderr, "Minimum BSDF set to %.4g\n", bsdf_min);
 #endif
-	min_log = log(bsdf_min*.5 + 1e-5);
+	min_log = log(bsdf_min*.5 + 1e-6);
 						/* output BSDF rep. */
 	for (n = 0; (n < 6) & (2*n+3 < argc); n++) {
 		double	theta = (M_PI/180.)*atof(argv[2*n+2]);
@@ -116,14 +117,14 @@ main(int argc, char *argv[])
 		idir[1] = idir[2] * sin(phi);
 		idir[2] = input_orient * sqrt(1. - idir[2]*idir[2]);
 #ifdef DEBUG
-		fprintf(stderr, "Computing BSDF for incident direction (%.1f,%.1f)\n",
+		fprintf(stderr, "Computing BSDF for incident direction (%.2f,%.2f)\n",
 				get_theta180(idir), get_phi360(idir));
 #endif
 		if (!inpXML)
 			rbf = advect_rbf(idir, 15000);
 #ifdef DEBUG
 		if (inpXML)
-			fprintf(stderr, "Hemispherical %s: %.3f\n",
+			fprintf(stderr, "Hemispherical %s: %.4f\n",
 				(output_orient > 0 ^ input_orient > 0 ?
 					"transmission" : "reflection"),
 				SDdirectHemi(idir, SDsampSp|SDsampDf |
@@ -132,7 +133,7 @@ main(int argc, char *argv[])
 		else if (rbf == NULL)
 			fputs("Empty RBF\n", stderr);
 		else
-			fprintf(stderr, "Hemispherical %s: %.3f\n",
+			fprintf(stderr, "Hemispherical %s: %.4f\n",
 				(output_orient > 0 ^ input_orient > 0 ?
 					"transmission" : "reflection"),
 				rbf->vtotal);
@@ -155,24 +156,24 @@ main(int argc, char *argv[])
 		}
 		fflush(stdout);
 		sprintf(buf, "gensurf tmat bsdf%d - - - %d %d %s", n+1,
-						GRIDRES-1, GRIDRES-1, validf);
+						grid_res-1, grid_res-1, validf);
 		fp = popen(buf, "w");
 		if (fp == NULL) {
 			fprintf(stderr, "%s: cannot open '| %s'\n", progname, buf);
 			return(1);
 		}
-		for (i = 0; i < GRIDRES; i++)
-		    for (j = 0; j < GRIDRES; j++) {
+		for (i = 0; i < grid_res; i++)
+		    for (j = 0; j < grid_res; j++) {
 			ovec_from_pos(odir, i, j);
 			if (inpXML) {
 				SDValue	sval;
-				if (SDreportError(SDevalBSDF(&sval, odir,
-							idir, &myBSDF), stderr))
+				if (SDreportError(SDevalBSDF(&sval, idir,
+							odir, &myBSDF), stderr))
 					return(1);
 				bsdf = sval.cieY;
 			} else
 				bsdf = eval_rbfrep(rbf, odir);
-			bsdf = log(bsdf + 1e-5) - min_log;
+			bsdf = log(bsdf + 1e-6) - min_log;
 			fprintf(fp, "%.8e %.8e %.8e\n",
 					odir[0]*bsdf, odir[1]*bsdf, odir[2]*bsdf);
 		    }