--- ray/src/cv/pabopto2bsdf.c	2014/03/08 01:05:00	2.15
+++ ray/src/cv/pabopto2bsdf.c	2014/03/19 00:19:11	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.15 2014/03/08 01:05:00 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.18 2014/03/19 00:19:11 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -25,6 +25,8 @@ typedef struct {
 	long		dstart;		/* data start offset in file */
 } PGINPUT;
 
+double		angle_eps = 0;	/* epsilon for angle comparisons */
+
 PGINPUT		*inpfile;	/* input files sorted by incidence */
 int		ninpfiles;	/* number of input files */
 
@@ -35,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);
 }
@@ -122,6 +124,7 @@ add_pabopto_inp(const int i)
 		return(0);
 	}
 					/* prepare input grid */
+	angle_eps = 180./2./GRIDRES;
 	if (!i || cmp_inang(&inpfile[i-1], &inpfile[i])) {
 		if (i)			/* need to process previous incidence */
 			make_rbfrep();
@@ -181,6 +184,7 @@ main(int argc, char *argv[])
 	for (i = 0; i < ninpfiles; i++)
 		if (!init_pabopto_inp(i, argv[i+1]))
 			return(1);
+	angle_eps = 0;
 	qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_inang);
 						/* compile measurements */
 	for (i = 0; i < ninpfiles; i++)
@@ -226,10 +230,10 @@ main(int argc, char *argv[])
 	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 + 1e-5) - min_log;