--- ray/src/util/wrapBSDF.c	2015/02/14 00:39:21	2.4
+++ ray/src/util/wrapBSDF.c	2015/02/17 02:44:54	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.4 2015/02/14 00:39:21 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.8 2015/02/17 02:44:54 greg Exp $";
 #endif
 /*
  * Wrap BSDF data in valid WINDOW XML file
@@ -18,7 +18,6 @@ const char	def_template[] = "minimalBSDFt.xml";
 const char	win6_template[] = "WINDOW6BSDFt.xml";
 
 const char	stdin_name[] = "<stdin>";
-
 					/* input files (can be stdin_name) */
 const char	*xml_input = NULL;
 					/* unit for materials & geometry */
@@ -27,12 +26,19 @@ const char	legal_units[] = "meter|foot|inch|centimeter
 					/* system materials & geometry */
 const char	*mgf_geometry = NULL;
 
-					/* angle basis */
+					/* angle bases */
 enum { ABdefault=-1, ABklemsFull=0, ABklemsHalf, ABklemsQuarter,
 		ABtensorTree3, ABtensorTree4, ABend };
 
 int		angle_basis = ABdefault;
 
+int		correct_solid_angle = 0;
+
+const char	*klems_basis_name[] = {
+	"LBNL/Klems Full",
+	"LBNL/Klems Half",
+	"LBNL/Klems Quarter",
+};
 					/* field IDs and nicknames */
 struct s_fieldID {
 	char		nickName[4];
@@ -57,7 +63,6 @@ struct s_fieldID {
 const char	*field_assignment[MAXASSIGN];
 int		nfield_assign = 0;
 #define FASEP	';'
-
 					/* data file(s) & spectra */
 enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward };
 
@@ -221,6 +226,7 @@ mat_assignments(const char *caller, const char *fn, ez
 	for (i = 0; i < nfield_assign; i++) {
 		const char	*fnext = field_assignment[i];
 		for ( ; ; ) {
+			int	added = 0;
 			ezxml_t	fld;
 			char	sbuf[512];
 			int	j;
@@ -253,7 +259,9 @@ mat_assignments(const char *caller, const char *fn, ez
 					fprintf(stderr,
 						"%s: warning - adding tag <%s>\n",
 							fn, sbuf);
+				ezxml_add_txt(wtl, "\t");
 				fld = ezxml_add_child_d(wtl, sbuf, strlen(wtl->txt));
+				++added;
 			}
 			if (XMLfieldID[j].has_unit)
 				ezxml_set_attr(fld, "unit", attr_unit);
@@ -277,6 +285,8 @@ mat_assignments(const char *caller, const char *fn, ez
 			}
 			sbuf[j] = '\0';
 			ezxml_set_txt_d(fld, sbuf);
+			if (added)
+				ezxml_add_txt(wtl, "\n\t");
 			fnext += (*fnext == FASEP);
 		}
 	}
@@ -373,10 +383,55 @@ determine_angle_basis(const char *fn, ezxml_t wtl)
 	return -1;
 }
 
+/* Filter Klems angle basis, factoring out incident projected solid angle */
+static int
+filter_klems_matrix(FILE *fp)
+{
+#define MAX_COLUMNS	145
+	const char	*bn = klems_basis_name[angle_basis];
+	float		col_corr[MAX_COLUMNS];
+	int		i, j, n = nabases;
+					/* get angle basis */
+	while (n-- > 0)
+		if (!strcasecmp(bn, abase_list[n].name))
+			break;
+	if (n < 0)
+		return 0;
+	if (abase_list[n].nangles > MAX_COLUMNS) {
+		fputs("Internal error - too many Klems columns!\n", stderr);
+		return 0;
+	}
+					/* get correction factors */
+	for (j = abase_list[n].nangles; j--; )
+		col_corr[j] = 1.f / io_getohm(j, &abase_list[n]);
+					/* read/correct/write matrix */
+	for (i = 0; i < abase_list[n].nangles; i++) {
+	    for (j = 0; j < abase_list[n].nangles; j++) {
+		double	d;
+		if (fscanf(fp, "%lf", &d) != 1)
+			return 0;
+		if (d < -1e-3) {
+			fputs("Negative BSDF data!\n", stderr);
+			return 0;
+		}
+		printf(" %.3e", d*col_corr[j]*(d > 0));
+	    }
+	    fputc('\n', stdout);
+	}
+	while ((i = getc(fp)) != EOF)
+		if (!isspace(i)) {
+			fputs("Unexpected data past EOF\n", stderr);
+			return 0;
+		}
+	return 1;			/* all is good */
+#undef MAX_COLUMNS
+}
+
 /* Write out BSDF data block with surrounding tags */
 static int
 writeBSDFblock(const char *caller, struct s_dfile *df)
 {
+	int	correct_klems = correct_solid_angle;
 	char	*cp;
 
 	puts("\t<WavelengthData>");
@@ -384,7 +439,7 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
 	switch (df->spectrum) {
 	case DSvisible:
 		puts("\t\t<Wavelength unit=\"Integral\">Visible</Wavelength>");
-		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
 		puts("\t\t<DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>");
 		break;
 	case DSxbar31:
@@ -442,17 +497,19 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
 	puts("</WavelengthDataDirection>");
 	switch (angle_basis) {
 	case ABklemsFull:
-		puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>");
-		break;
 	case ABklemsHalf:
-		puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Half</ColumnAngleBasis>");
-		break;
 	case ABklemsQuarter:
-		puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Quarter</ColumnAngleBasis>");
+		fputs("\t\t\t<ColumnAngleBasis>", stdout);
+		fputs(klems_basis_name[angle_basis], stdout);
+		puts("</ColumnAngleBasis>");
+		fputs("\t\t\t<RowAngleBasis>", stdout);
+		fputs(klems_basis_name[angle_basis], stdout);
+		puts("</RowAngleBasis>");
 		break;
 	case ABtensorTree3:
 	case ABtensorTree4:
 		puts("\t\t\t<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>");
+		correct_klems = 0;
 		break;
 	default:
 		fprintf(stderr, "%s: bad angle basis (%d)\n", caller, angle_basis);
@@ -461,7 +518,30 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
 	puts("\t\t\t<ScatteringDataType>BTDF</ScatteringDataType>");
 	puts("\t\t\t<ScatteringData>");
 	fflush(stdout);
-	if (df->fname == stdin_name) {
+	if (correct_klems) {			/* correct Klems matrix data */
+		FILE	*fp = stdin;
+		if (df->fname[0] == '!')
+			fp = popen(df->fname+1, "r");
+		else if (df->fname != stdin_name)
+			fp = fopen(df->fname, "r");
+		if (fp == NULL) {
+			fprintf(stderr, "%s: cannot open '%s'\n",
+					caller, df->fname);
+			return 0;
+		}
+		if (!filter_klems_matrix(fp)) {
+			fprintf(stderr, "%s: Klems data error from '%s'\n",
+					caller, df->fname);
+			return 0;
+		}
+		if (df->fname[0] != '!') {
+			fclose(fp);
+		} else if (pclose(fp)) {
+			fprintf(stderr, "%s: error running '%s'\n",
+					caller, df->fname);
+			return 0;
+		}
+	} else if (df->fname == stdin_name) {
 		copy_and_close(fileno(stdin));
 	} else if (df->fname[0] != '!') {
 		if (!copy_and_close(open(df->fname, O_RDONLY))) {
@@ -593,7 +673,8 @@ wrapBSDF(const char *caller)
 		ezxml_t	ab, dd = ezxml_child(wtl, "DataDefinition");
 		if (dd != NULL) {
 			offset = dd->off;
-			fprintf(stderr,
+			if (dd->child != NULL)
+				fprintf(stderr,
 		"%s: warning - replacing existing <DataDefinition> in '%s'\n",
 						caller, xml_path);
 			ezxml_remove(dd);
@@ -693,6 +774,9 @@ main(int argc, char *argv[])
 			else
 				UsageExit(argv[0]);
 			continue;
+		case 'c':		/* correct solid angle */
+			correct_solid_angle ^= 1;
+			continue;
 		case 't':		/* transmission */
 			if (i >= argc-1)
 				UsageExit(argv[0]);
@@ -734,7 +818,8 @@ main(int argc, char *argv[])
 				argv[i] = (char *)stdin_name;
 			}
 			data_file[ndataf].fname = argv[i];
-			data_file[ndataf++].spectrum = cur_spectrum;
+			data_file[ndataf].spectrum = cur_spectrum;
+			ndataf++;
 			continue;
 		case 's':		/* spectrum name or input file */
 			if (++i >= argc)
@@ -796,8 +881,6 @@ doneOptions:					/* get XML input */
 	} else {
 		xml_input = argv[i];
 	}
-	if ((xml_input == win6_template) & (angle_basis == ABdefault))
-		angle_basis = ABklemsFull;
 						/* wrap it! */
 	return !wrapBSDF(argv[0]);
 }