--- ray/src/cv/pabopto2bsdf.c	2014/01/30 18:19:43	2.11
+++ ray/src/cv/pabopto2bsdf.c	2014/03/18 19:08:24	2.17
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.11 2014/01/30 18:19:43 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.17 2014/03/18 19:08:24 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -14,6 +14,7 @@ static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.1
 #include <math.h>
 #include "platform.h"
 #include "bsdfrep.h"
+#include "resolu.h"
 				/* global argv[0] */
 char			*progname;
 
@@ -24,6 +25,8 @@ typedef struct {
 	long		dstart;		/* data start offset in file */
 } PGINPUT;
 
+const double	ANGLE_EPS = 180./2./GRIDRES;
+
 PGINPUT		*inpfile;	/* input files sorted by incidence */
 int		ninpfiles;	/* number of input files */
 
@@ -34,13 +37,13 @@ cmp_inang(const void *p1, const void *p2)
 	const PGINPUT	*inp1 = (const PGINPUT *)p1;
 	const PGINPUT	*inp2 = (const PGINPUT *)p2;
 	
-	if (inp1->theta > inp2->theta+FTINY)
+	if (inp1->theta > inp2->theta+ANGLE_EPS)
 		return(1);
-	if (inp1->theta < inp2->theta-FTINY)
+	if (inp1->theta < inp2->theta-ANGLE_EPS)
 		return(-1);
-	if (inp1->phi > inp2->phi+FTINY)
+	if (inp1->phi > inp2->phi+ANGLE_EPS)
 		return(1);
-	if (inp1->phi < inp2->phi-FTINY)
+	if (inp1->phi < inp2->phi-ANGLE_EPS)
 		return(-1);
 	return(0);
 }
@@ -219,19 +222,19 @@ main(int argc, char *argv[])
 #ifdef DEBUG
 	fprintf(stderr, "Minimum BSDF = %.4f\n", bsdf_min);
 #endif
+	min_log = log(bsdf_min*.5 + 1e-5);
 #if 1						/* produce spheres at meas. */
 	puts("void plastic yellow\n0\n0\n5 .6 .4 .01 .04 .08\n");
-	min_log = log(bsdf_min*.5);
 	n = 0;
 	for (i = 0; i < GRIDRES; i++)
 	    for (j = 0; j < GRIDRES; j++)
-		if (dsf_grid[i][j].nval > 0) {
+		if (dsf_grid[i][j].sum.n > 0) {
 			ovec_from_pos(dir, i, j);
-			bsdf = dsf_grid[i][j].vsum /
-				(dsf_grid[i][j].nval*output_orient*dir[2]);
+			bsdf = dsf_grid[i][j].sum.v /
+				(dsf_grid[i][j].sum.n*output_orient*dir[2]);
 			if (bsdf <= bsdf_min*.6)
 				continue;
-			bsdf = log(bsdf) - min_log;
+			bsdf = log(bsdf + 1e-5) - min_log;
 			ovec_from_pos(dir, i, j);
 			printf("yellow sphere s%04d\n0\n0\n", ++n);
 			printf("4 %.6g %.6g %.6g %.6g\n\n",
@@ -245,7 +248,7 @@ main(int argc, char *argv[])
 		RBFVAL	*rbf = &dsf_list->rbfa[n];
 		ovec_from_pos(dir, rbf->gx, rbf->gy);
 		bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
-		bsdf = log(bsdf) - min_log;
+		bsdf = log(bsdf + 1e-5) - min_log;
 		printf("red sphere p%04d\n0\n0\n", ++n);
 		printf("4 %.6g %.6g %.6g %.6g\n\n",
 				dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf,
@@ -265,7 +268,7 @@ main(int argc, char *argv[])
 	    for (j = 0; j < GRIDRES; j++) {
 		ovec_from_pos(dir, i, j);
 		bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]);
-		bsdf = log(bsdf) - min_log;
+		bsdf = log(bsdf + 1e-5) - min_log;
 		fprintf(pfp, "%.8e %.8e %.8e\n",
 				dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf);
 	    }