27 |
|
/* system materials & geometry */ |
28 |
|
const char *mgf_geometry = NULL; |
29 |
|
/* comment list */ |
30 |
< |
#define MAXCOMM 30 |
30 |
> |
#define MAXCOMM 80 |
31 |
|
const char *commlist[MAXCOMM]; |
32 |
|
int ncomm = 0; |
33 |
|
/* angle bases */ |
69 |
|
int nfield_assign = 0; |
70 |
|
#define FASEP ';' |
71 |
|
/* data file(s) & spectra */ |
72 |
< |
enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward }; |
72 |
> |
enum { DTransFront, DTransBack, DTreflFront, DTreflBack }; |
73 |
|
|
74 |
+ |
static const char component_name[4][20] = { |
75 |
+ |
"Transmission Front", |
76 |
+ |
"Transmission Back", |
77 |
+ |
"Reflection Front", |
78 |
+ |
"Reflection Back" |
79 |
+ |
}; |
80 |
+ |
|
81 |
|
enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5, |
82 |
|
DSuprime=-6, DSvprime=-7 }; |
83 |
|
|
139 |
|
if ((data_file[i].spectrum == data_file[ndataf].spectrum) & |
140 |
|
(data_file[i].type == data_file[ndataf].type)) { |
141 |
|
fprintf(stderr, |
142 |
< |
"%s: warning - ignoring duplicate component\n", |
143 |
< |
data_file[ndataf].fname); |
142 |
> |
"%s: warning - ignoring duplicate component %s\n", |
143 |
> |
data_file[ndataf].fname, |
144 |
> |
component_name[data_file[i].type]); |
145 |
|
return 0; |
146 |
|
} |
147 |
|
return 1; |
417 |
|
return -1; |
418 |
|
} |
419 |
|
|
420 |
< |
/* Filter Klems angle basis, factoring out incident projected solid angle */ |
420 |
> |
/* Filter Klems angle data, factoring out incident projected solid angle */ |
421 |
|
static int |
422 |
|
filter_klems_matrix(FILE *fp) |
423 |
|
{ |
424 |
|
const char *bn = klems_basis_name[angle_basis]; |
425 |
< |
int i, j, n = nabases; |
425 |
> |
int i, j, c, n = nabases; |
426 |
|
/* get angle basis */ |
427 |
|
while (n-- > 0) |
428 |
|
if (!strcasecmp(bn, abase_list[n].name)) |
434 |
|
const double corr = 1./io_getohm(i, &abase_list[n]); |
435 |
|
for (j = 0; j < abase_list[n].nangles; j++) { |
436 |
|
double d; |
437 |
< |
if (fscanf(fp, "%lf", &d) != 1) |
437 |
> |
if (fscanf(fp, "%lf ", &d) != 1) |
438 |
|
return 0; |
439 |
+ |
if ((c = getc(fp)) != ',') |
440 |
+ |
ungetc(c, fp); |
441 |
|
if (d < -1e-3) { |
442 |
|
fputs("Negative BSDF data!\n", stderr); |
443 |
|
return 0; |
446 |
|
} |
447 |
|
fputc('\n', stdout); |
448 |
|
} |
449 |
< |
while ((i = getc(fp)) != EOF) |
450 |
< |
if (!isspace(i)) { |
449 |
> |
while ((c = getc(fp)) != EOF) |
450 |
> |
if (!isspace(c)) { |
451 |
|
fputs("Unexpected data past EOF\n", stderr); |
452 |
|
return 0; |
453 |
|
} |
512 |
|
} |
513 |
|
puts("\t\t<WavelengthDataBlock>"); |
514 |
|
fputs("\t\t\t<WavelengthDataDirection>", stdout); |
515 |
< |
switch (df->type) { |
506 |
< |
case DTtransForward: |
507 |
< |
fputs("Transmission Front", stdout); |
508 |
< |
break; |
509 |
< |
case DTtransBackward: |
510 |
< |
fputs("Transmission Back", stdout); |
511 |
< |
break; |
512 |
< |
case DTreflForward: |
513 |
< |
fputs("Reflection Front", stdout); |
514 |
< |
break; |
515 |
< |
case DTreflBackward: |
516 |
< |
fputs("Reflection Back", stdout); |
517 |
< |
break; |
518 |
< |
default: |
519 |
< |
fprintf(stderr, "%s: internal - bad BSDF type (%d)\n", caller, df->type); |
520 |
< |
return 0; |
521 |
< |
} |
515 |
> |
fputs(component_name[df->type], stdout); |
516 |
|
puts("</WavelengthDataDirection>"); |
517 |
|
switch (angle_basis) { |
518 |
|
case ABklemsFull: |
819 |
|
argv[0]); |
820 |
|
return 1; |
821 |
|
} |
822 |
< |
if (strchr(argv[++i], '>') != NULL) { |
822 |
> |
if (strstr(argv[++i], "-->") != NULL) { |
823 |
|
fprintf(stderr, "%s: illegal character in comment\n", |
824 |
|
argv[0]); |
825 |
|
return 1; |
835 |
|
return 1; |
836 |
|
} |
837 |
|
if (!strcmp(argv[i], "-tf")) |
838 |
< |
data_file[ndataf].type = DTtransForward; |
838 |
> |
data_file[ndataf].type = DTransFront; |
839 |
|
else if (!strcmp(argv[i], "-tb")) |
840 |
< |
data_file[ndataf].type = DTtransBackward; |
840 |
> |
data_file[ndataf].type = DTransBack; |
841 |
|
else |
842 |
|
UsageExit(argv[0]); |
843 |
|
if (!strcmp(argv[++i], "-")) { |
857 |
|
return 1; |
858 |
|
} |
859 |
|
if (!strcmp(argv[i], "-rf")) |
860 |
< |
data_file[ndataf].type = DTreflForward; |
860 |
> |
data_file[ndataf].type = DTreflFront; |
861 |
|
else if (!strcmp(argv[i], "-rb")) |
862 |
< |
data_file[ndataf].type = DTreflBackward; |
862 |
> |
data_file[ndataf].type = DTreflBack; |
863 |
|
else |
864 |
|
UsageExit(argv[0]); |
865 |
|
if (!strcmp(argv[++i], "-")) { |
868 |
|
} |
869 |
|
data_file[ndataf].fname = argv[i]; |
870 |
|
data_file[ndataf].spectrum = cur_spectrum; |
871 |
< |
ndataf++; |
871 |
> |
ndataf += check_new_data_file(); |
872 |
|
continue; |
873 |
|
case 's': /* spectrum name or input file */ |
874 |
|
if (++i >= argc) |
921 |
|
} |
922 |
|
break; |
923 |
|
} |
924 |
< |
doneOptions: /* get XML input */ |
924 |
> |
/* get XML input */ |
925 |
|
if (i >= argc) { |
926 |
|
if (xml_input == NULL) |
927 |
|
xml_input = def_template; |