--- ray/src/cv/pabopto2bsdf.c	2014/02/20 09:21:32	2.14
+++ ray/src/cv/pabopto2bsdf.c	2014/03/19 19:48:57	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.14 2014/02/20 09:21:32 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.19 2014/03/19 19:48:57 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;
 
+double		angle_eps = 0;	/* epsilon for angle comparisons */
+
 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);
 }
@@ -111,9 +114,10 @@ init_pabopto_inp(const int i, const char *fname)
 static int
 add_pabopto_inp(const int i)
 {
-	FILE	*fp = fopen(inpfile[i].fname, "r");
-	double	theta_out, phi_out, val;
-	int	n, c;
+	static int	lastnew = -1;
+	FILE		*fp = fopen(inpfile[i].fname, "r");
+	double		theta_out, phi_out, val;
+	int		n, c;
 	
 	if (fp == NULL || fseek(fp, inpfile[i].dstart, 0) == EOF) {
 		fputs(inpfile[i].fname, stderr);
@@ -121,14 +125,16 @@ add_pabopto_inp(const int i)
 		return(0);
 	}
 					/* prepare input grid */
-	if (!i || cmp_inang(&inpfile[i-1], &inpfile[i])) {
-		if (i)			/* need to process previous incidence */
+	angle_eps = 180./2./GRIDRES;
+	if (lastnew < 0 || cmp_inang(&inpfile[lastnew], &inpfile[i])) {
+		if (lastnew >= 0)	/* need to process previous incidence */
 			make_rbfrep();
 #ifdef DEBUG
 		fprintf(stderr, "New incident (theta,phi)=(%f,%f)\n",
 					inpfile[i].theta, inpfile[i].phi);
 #endif
 		new_bsdf_data(inpfile[i].theta, inpfile[i].phi);
+		lastnew = i;
 	}
 #ifdef DEBUG
 	fprintf(stderr, "Loading measurements from '%s'...\n", inpfile[i].fname);
@@ -180,6 +186,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++)
@@ -225,10 +232,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;