18 |
|
const char win6_template[] = "WINDOW6BSDFt.xml"; |
19 |
|
|
20 |
|
const char stdin_name[] = "<stdin>"; |
21 |
– |
|
21 |
|
/* input files (can be stdin_name) */ |
22 |
|
const char *xml_input = NULL; |
23 |
|
/* unit for materials & geometry */ |
26 |
|
/* system materials & geometry */ |
27 |
|
const char *mgf_geometry = NULL; |
28 |
|
|
29 |
< |
/* angle basis */ |
29 |
> |
/* angle bases */ |
30 |
|
enum { ABdefault=-1, ABklemsFull=0, ABklemsHalf, ABklemsQuarter, |
31 |
|
ABtensorTree3, ABtensorTree4, ABend }; |
32 |
|
|
33 |
|
int angle_basis = ABdefault; |
34 |
|
|
35 |
+ |
int correct_solid_angle = 0; |
36 |
+ |
|
37 |
+ |
const char *klems_basis_name[] = { |
38 |
+ |
"LBNL/Klems Full", |
39 |
+ |
"LBNL/Klems Half", |
40 |
+ |
"LBNL/Klems Quarter", |
41 |
+ |
}; |
42 |
|
/* field IDs and nicknames */ |
43 |
|
struct s_fieldID { |
44 |
|
char nickName[4]; |
63 |
|
const char *field_assignment[MAXASSIGN]; |
64 |
|
int nfield_assign = 0; |
65 |
|
#define FASEP ';' |
60 |
– |
|
66 |
|
/* data file(s) & spectra */ |
67 |
|
enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward }; |
68 |
|
|
84 |
|
|
85 |
|
static char basis_definition[][256] = { |
86 |
|
|
87 |
+ |
"\t<DataDefinition>\n" |
88 |
|
"\t\t<IncidentDataStructure>Columns</IncidentDataStructure>\n" |
89 |
|
"\t\t<AngleBasis>\n" |
90 |
|
"\t\t\t<AngleBasisName>LBNL/Klems Full</AngleBasisName>\n" |
91 |
< |
"\t\t</AngleBasis>\n", |
91 |
> |
"\t\t\t</AngleBasis>\n" |
92 |
> |
"\t</DataDefinition>\n", |
93 |
|
|
94 |
+ |
"\t<DataDefinition>\n" |
95 |
|
"\t\t<IncidentDataStructure>Columns</IncidentDataStructure>\n" |
96 |
|
"\t\t<AngleBasis>\n" |
97 |
|
"\t\t\t<AngleBasisName>LBNL/Klems Half</AngleBasisName>\n" |
98 |
< |
"\t\t</AngleBasis>\n", |
98 |
> |
"\t\t\t</AngleBasis>\n" |
99 |
> |
"\t</DataDefinition>\n", |
100 |
|
|
101 |
+ |
"\t<DataDefinition>\n" |
102 |
|
"\t\t<IncidentDataStructure>Columns</IncidentDataStructure>\n" |
103 |
|
"\t\t<AngleBasis>\n" |
104 |
|
"\t\t\t<AngleBasisName>LBNL/Klems Quarter</AngleBasisName>\n" |
105 |
< |
"\t\t</AngleBasis>\n", |
105 |
> |
"\t\t\t</AngleBasis>\n" |
106 |
> |
"\t</DataDefinition>\n", |
107 |
|
|
108 |
< |
"\t\t<IncidentDataStructure>TensorTree3</IncidentDataStructure>\n", |
108 |
> |
"\t<DataDefinition>\n" |
109 |
> |
"\t\t<IncidentDataStructure>TensorTree3</IncidentDataStructure>\n" |
110 |
> |
"\t</DataDefinition>\n", |
111 |
|
|
112 |
< |
"\t\t<IncidentDataStructure>TensorTree4</IncidentDataStructure>\n", |
112 |
> |
"\t<DataDefinition>\n" |
113 |
> |
"\t\t<IncidentDataStructure>TensorTree4</IncidentDataStructure>\n" |
114 |
> |
"\t</DataDefinition>\n", |
115 |
|
}; |
116 |
|
|
117 |
|
/* Copy data from file descriptor to stdout and close */ |
226 |
|
for (i = 0; i < nfield_assign; i++) { |
227 |
|
const char *fnext = field_assignment[i]; |
228 |
|
for ( ; ; ) { |
229 |
+ |
int added = 0; |
230 |
|
ezxml_t fld; |
231 |
|
char sbuf[512]; |
232 |
|
int j; |
259 |
|
fprintf(stderr, |
260 |
|
"%s: warning - adding tag <%s>\n", |
261 |
|
fn, sbuf); |
262 |
+ |
ezxml_add_txt(wtl, "\t"); |
263 |
|
fld = ezxml_add_child_d(wtl, sbuf, strlen(wtl->txt)); |
264 |
+ |
++added; |
265 |
|
} |
266 |
|
if (XMLfieldID[j].has_unit) |
267 |
|
ezxml_set_attr(fld, "unit", attr_unit); |
285 |
|
} |
286 |
|
sbuf[j] = '\0'; |
287 |
|
ezxml_set_txt_d(fld, sbuf); |
288 |
+ |
if (added) |
289 |
+ |
ezxml_add_txt(wtl, "\n\t"); |
290 |
|
fnext += (*fnext == FASEP); |
291 |
|
} |
292 |
|
} |
294 |
|
if (xml_input == win6_template) |
295 |
|
for (i = 0; XMLfieldID[i].nickName[0]; i++) |
296 |
|
if (XMLfieldID[i].win_need && |
297 |
< |
!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) { |
297 |
> |
!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) |
298 |
|
fprintf(stderr, |
299 |
< |
"%s: missing required '%s' assignment for WINDOW <%s>\n", |
299 |
> |
"%s: warning - missing '%s' assignment for WINDOW <%s>\n", |
300 |
|
caller, XMLfieldID[i].nickName, |
301 |
|
XMLfieldID[i].fullName); |
302 |
< |
return 0; |
283 |
< |
} |
284 |
< |
return 1; /* no errors */ |
302 |
> |
return 1; |
303 |
|
} |
304 |
|
|
305 |
|
/* Complete angle basis specification */ |
327 |
|
sprintf(buf, "%g", i ? |
328 |
|
.5*(abase_list[n].lat[i].tmin + abase_list[n].lat[i+1].tmin) : |
329 |
|
.0); |
330 |
+ |
ezxml_add_txt(abb, "\n\t\t\t\t"); |
331 |
|
ezxml_set_txt_d(ezxml_add_child(abb,"Theta",strlen(abb->txt)), buf); |
332 |
|
sprintf(buf, "%d", abase_list[n].lat[i].nphis); |
333 |
+ |
ezxml_add_txt(abb, "\n\t\t\t\t"); |
334 |
|
ezxml_set_txt_d(ezxml_add_child(abb,"nPhis",strlen(abb->txt)), buf); |
335 |
+ |
ezxml_add_txt(abb, "\n\t\t\t\t"); |
336 |
|
tb = ezxml_add_child(abb, "ThetaBounds", strlen(abb->txt)); |
337 |
+ |
ezxml_add_txt(tb, "\n\t\t\t\t\t"); |
338 |
|
sprintf(buf, "%g", abase_list[n].lat[i].tmin); |
339 |
< |
ezxml_set_txt(ezxml_add_child(tb,"LowerTheta",strlen(tb->txt)), buf); |
339 |
> |
ezxml_set_txt_d(ezxml_add_child(tb,"LowerTheta",strlen(tb->txt)), buf); |
340 |
> |
ezxml_add_txt(tb, "\n\t\t\t\t\t"); |
341 |
|
sprintf(buf, "%g", abase_list[n].lat[i+1].tmin); |
342 |
< |
ezxml_set_txt(ezxml_add_child(tb,"UpperTheta",strlen(tb->txt)), buf); |
342 |
> |
ezxml_set_txt_d(ezxml_add_child(tb,"UpperTheta",strlen(tb->txt)), buf); |
343 |
> |
ezxml_add_txt(tb, "\n\t\t\t\t"); |
344 |
> |
ezxml_add_txt(abb, "\n\t\t\t"); |
345 |
> |
ezxml_add_txt(ab, "\n\t\t\t"); |
346 |
|
} |
347 |
|
return 1; |
348 |
|
} |
358 |
|
if (wtl == NULL) |
359 |
|
return -1; |
360 |
|
ids = ezxml_txt(ezxml_child(wtl, "IncidentDataStructure")); |
361 |
< |
if (ids == NULL) |
361 |
> |
if (!ids[0]) |
362 |
|
return -1; |
363 |
|
for (i = 0; i < ABend; i++) { |
364 |
|
ezxml_t parsed = ezxml_parse_str(basis_definition[i], |
381 |
|
return -1; |
382 |
|
} |
383 |
|
|
384 |
+ |
/* Filter Klems angle basis, factoring out incident projected solid angle */ |
385 |
+ |
static int |
386 |
+ |
filter_klems_matrix(FILE *fp) |
387 |
+ |
{ |
388 |
+ |
#define MAX_COLUMNS 145 |
389 |
+ |
const char *bn = klems_basis_name[angle_basis]; |
390 |
+ |
float col_corr[MAX_COLUMNS]; |
391 |
+ |
int i, j, n = nabases; |
392 |
+ |
/* get angle basis */ |
393 |
+ |
while (n-- > 0) |
394 |
+ |
if (!strcasecmp(bn, abase_list[n].name)) |
395 |
+ |
break; |
396 |
+ |
if (n < 0) |
397 |
+ |
return 0; |
398 |
+ |
if (abase_list[n].nangles > MAX_COLUMNS) { |
399 |
+ |
fputs("Internal error - too many Klems columns!\n", stderr); |
400 |
+ |
return 0; |
401 |
+ |
} |
402 |
+ |
/* get correction factors */ |
403 |
+ |
for (j = abase_list[n].nangles; j--; ) |
404 |
+ |
col_corr[j] = 1.f / io_getohm(j, &abase_list[n]); |
405 |
+ |
/* read/correct/write matrix */ |
406 |
+ |
for (i = 0; i < abase_list[n].nangles; i++) { |
407 |
+ |
for (j = 0; j < abase_list[n].nangles; j++) { |
408 |
+ |
double d; |
409 |
+ |
if (fscanf(fp, "%lf", &d) != 1) |
410 |
+ |
return 0; |
411 |
+ |
if (d < -1e-3) { |
412 |
+ |
fputs("Negative BSDF data!\n", stderr); |
413 |
+ |
return 0; |
414 |
+ |
} |
415 |
+ |
printf(" %.3e", d*col_corr[j]*(d > 0)); |
416 |
+ |
} |
417 |
+ |
fputc('\n', stdout); |
418 |
+ |
} |
419 |
+ |
while ((i = getc(fp)) != EOF) |
420 |
+ |
if (!isspace(i)) { |
421 |
+ |
fputs("Unexpected data past EOF\n", stderr); |
422 |
+ |
return 0; |
423 |
+ |
} |
424 |
+ |
return 1; /* all is good */ |
425 |
+ |
#undef MAX_COLUMNS |
426 |
+ |
} |
427 |
+ |
|
428 |
|
/* Write out BSDF data block with surrounding tags */ |
429 |
|
static int |
430 |
|
writeBSDFblock(const char *caller, struct s_dfile *df) |
431 |
|
{ |
432 |
+ |
int correct_klems = correct_solid_angle; |
433 |
|
char *cp; |
434 |
|
|
435 |
|
puts("\t<WavelengthData>"); |
437 |
|
switch (df->spectrum) { |
438 |
|
case DSvisible: |
439 |
|
puts("\t\t<Wavelength unit=\"Integral\">Visible</Wavelength>"); |
440 |
< |
puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>"); |
440 |
> |
puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>"); |
441 |
|
puts("\t\t<DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>"); |
442 |
|
break; |
443 |
|
case DSxbar31: |
495 |
|
puts("</WavelengthDataDirection>"); |
496 |
|
switch (angle_basis) { |
497 |
|
case ABklemsFull: |
427 |
– |
puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>"); |
428 |
– |
break; |
498 |
|
case ABklemsHalf: |
430 |
– |
puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Half</ColumnAngleBasis>"); |
431 |
– |
break; |
499 |
|
case ABklemsQuarter: |
500 |
< |
puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Quarter</ColumnAngleBasis>"); |
500 |
> |
fputs("\t\t\t<ColumnAngleBasis>", stdout); |
501 |
> |
fputs(klems_basis_name[angle_basis], stdout); |
502 |
> |
puts("</ColumnAngleBasis>"); |
503 |
> |
fputs("\t\t\t<RowAngleBasis>", stdout); |
504 |
> |
fputs(klems_basis_name[angle_basis], stdout); |
505 |
> |
puts("</RowAngleBasis>"); |
506 |
|
break; |
507 |
|
case ABtensorTree3: |
508 |
|
case ABtensorTree4: |
509 |
|
puts("\t\t\t<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>"); |
510 |
+ |
correct_klems = 0; |
511 |
|
break; |
512 |
|
default: |
513 |
|
fprintf(stderr, "%s: bad angle basis (%d)\n", caller, angle_basis); |
516 |
|
puts("\t\t\t<ScatteringDataType>BTDF</ScatteringDataType>"); |
517 |
|
puts("\t\t\t<ScatteringData>"); |
518 |
|
fflush(stdout); |
519 |
< |
if (df->fname == stdin_name) { |
519 |
> |
if (correct_klems) { /* correct Klems matrix data */ |
520 |
> |
FILE *fp = stdin; |
521 |
> |
if (df->fname[0] == '!') |
522 |
> |
fp = popen(df->fname+1, "r"); |
523 |
> |
else if (df->fname != stdin_name) |
524 |
> |
fp = fopen(df->fname, "r"); |
525 |
> |
if (fp == NULL) { |
526 |
> |
fprintf(stderr, "%s: cannot open '%s'\n", |
527 |
> |
caller, df->fname); |
528 |
> |
return 0; |
529 |
> |
} |
530 |
> |
if (!filter_klems_matrix(fp)) { |
531 |
> |
fprintf(stderr, "%s: Klems data error from '%s'\n", |
532 |
> |
caller, df->fname); |
533 |
> |
return 0; |
534 |
> |
} |
535 |
> |
if (df->fname[0] != '!') { |
536 |
> |
fclose(fp); |
537 |
> |
} else if (pclose(fp)) { |
538 |
> |
fprintf(stderr, "%s: error running '%s'\n", |
539 |
> |
caller, df->fname); |
540 |
> |
return 0; |
541 |
> |
} |
542 |
> |
} else if (df->fname == stdin_name) { |
543 |
|
copy_and_close(fileno(stdin)); |
544 |
|
} else if (df->fname[0] != '!') { |
545 |
|
if (!copy_and_close(open(df->fname, O_RDONLY))) { |
586 |
|
} |
587 |
|
fputs(xml+ei, stdout); /* write trailer */ |
588 |
|
free(xml); /* free string */ |
589 |
+ |
fputc('\n', stdout); |
590 |
|
return (fflush(stdout) == 0); |
591 |
|
} |
592 |
|
|
667 |
|
} |
668 |
|
/* check basis */ |
669 |
|
if (angle_basis != ABdefault) { |
670 |
+ |
size_t offset = 0; |
671 |
|
ezxml_t ab, dd = ezxml_child(wtl, "DataDefinition"); |
672 |
< |
if (dd == NULL) { |
673 |
< |
dd = ezxml_add_child(wtl, "DataDefinition", strlen(wtl->txt)); |
674 |
< |
} else if (dd->child != NULL) { |
675 |
< |
fprintf(stderr, |
672 |
> |
if (dd != NULL) { |
673 |
> |
offset = dd->off; |
674 |
> |
if (dd->child != NULL) |
675 |
> |
fprintf(stderr, |
676 |
|
"%s: warning - replacing existing <DataDefinition> in '%s'\n", |
677 |
|
caller, xml_path); |
678 |
< |
do |
679 |
< |
ezxml_remove(dd->child); |
680 |
< |
while (dd->child != NULL); |
681 |
< |
} |
584 |
< |
ezxml_insert(ezxml_parse_str(basis_definition[angle_basis], |
678 |
> |
ezxml_remove(dd); |
679 |
> |
} else |
680 |
> |
offset = strlen(wtl->txt); |
681 |
> |
dd = ezxml_insert(ezxml_parse_str(basis_definition[angle_basis], |
682 |
|
strlen(basis_definition[angle_basis])), |
683 |
< |
dd, 0); |
683 |
> |
wtl, offset); |
684 |
|
if ((ab = ezxml_child(dd, "AngleBasis")) != NULL && |
685 |
|
!finish_angle_basis(ab)) |
686 |
|
goto failure; |
772 |
|
else |
773 |
|
UsageExit(argv[0]); |
774 |
|
continue; |
775 |
+ |
case 'c': /* correct solid angle */ |
776 |
+ |
correct_solid_angle = 1; |
777 |
+ |
continue; |
778 |
|
case 't': /* transmission */ |
779 |
|
if (i >= argc-1) |
780 |
|
UsageExit(argv[0]); |
816 |
|
argv[i] = (char *)stdin_name; |
817 |
|
} |
818 |
|
data_file[ndataf].fname = argv[i]; |
819 |
< |
data_file[ndataf++].spectrum = cur_spectrum; |
819 |
> |
data_file[ndataf].spectrum = cur_spectrum; |
820 |
> |
ndataf++; |
821 |
|
continue; |
822 |
|
case 's': /* spectrum name or input file */ |
823 |
|
if (++i >= argc) |
879 |
|
} else { |
880 |
|
xml_input = argv[i]; |
881 |
|
} |
781 |
– |
if ((xml_input == win6_template) & (angle_basis == ABdefault)) |
782 |
– |
angle_basis = ABklemsFull; |
882 |
|
/* wrap it! */ |
883 |
|
return !wrapBSDF(argv[0]); |
884 |
|
} |