41 |
|
char *kfullfn = "klems_full.cal"; |
42 |
|
char *khalffn = "klems_half.cal"; |
43 |
|
char *kquarterfn = "klems_quarter.cal"; |
44 |
+ |
char *ciefn = "cieskyscan.cal"; |
45 |
|
|
46 |
|
/* string indicating parameters */ |
47 |
|
const char PARAMSTART[] = "@rfluxmtx"; |
500 |
|
calfn = kquarterfn; kquarterfn = NULL; |
501 |
|
binf = "kqbin"; |
502 |
|
nbins = "Nkqbins"; |
503 |
+ |
} else if (!strcasecmp(curparams.hemis, "cie")) { |
504 |
+ |
calfn = ciefn; ciefn = NULL; |
505 |
+ |
sprintf(sbuf, "rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1", |
506 |
+ |
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
507 |
+ |
curparams.vup[0], curparams.vup[1], curparams.vup[2], |
508 |
+ |
curparams.sign); |
509 |
+ |
binv = "cbin"; |
510 |
+ |
nbins = "Ncbins"; |
511 |
|
} else { |
512 |
|
fprintf(stderr, "%s: unrecognized hemisphere sampling: h=%s\n", |
513 |
|
progname, curparams.hemis); |
749 |
|
{ |
750 |
|
int n = sampcnt; |
751 |
|
double samp3[3]; |
752 |
< |
double duvw[3]; |
744 |
< |
FVECT orig_dir[2]; |
752 |
> |
FVECT duvw, orig_dir[2]; |
753 |
|
int i; |
754 |
|
|
755 |
|
if (fp == NULL) /* just requesting number of bins? */ |
757 |
|
|
758 |
|
while (n--) { /* stratified hemisphere sampling */ |
759 |
|
SDmultiSamp(samp3, 3, (n+frandom())/sampcnt); |
760 |
< |
SDsquare2disk(duvw, samp3[1], samp3[2]); |
760 |
> |
square2disk(duvw, samp3[1], samp3[2]); |
761 |
|
duvw[2] = -sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]); |
762 |
|
for (i = 3; i--; ) |
763 |
|
orig_dir[1][i] = duvw[0]*p->udir[i] + |
777 |
|
{ |
778 |
|
int n = sampcnt; |
779 |
|
double samp3[3]; |
780 |
< |
double duvw[3]; |
773 |
< |
FVECT orig_dir[2]; |
780 |
> |
FVECT duvw, orig_dir[2]; |
781 |
|
int i; |
782 |
|
|
783 |
|
if (fp == NULL) /* just requesting number of bins? */ |
785 |
|
|
786 |
|
while (n--) { /* stratified sampling */ |
787 |
|
SDmultiSamp(samp3, 3, (n+frandom())/sampcnt); |
788 |
< |
SDsquare2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz, |
788 |
> |
square2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz, |
789 |
|
(b%p->hsiz + samp3[2])/curparams.hsiz); |
790 |
|
duvw[2] = sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]); |
791 |
|
for (i = 3; i--; ) |
1292 |
|
yrs = argv[++a]; |
1293 |
|
na = 0; |
1294 |
|
continue; |
1295 |
< |
case 'c': /* number of samples */ |
1296 |
< |
sampcnt = atoi(argv[++a]); |
1297 |
< |
if (sampcnt <= 0) |
1298 |
< |
goto userr; |
1299 |
< |
na = 0; /* we re-add this later */ |
1300 |
< |
continue; |
1295 |
> |
case 'c': /* spectral sampling or count */ |
1296 |
> |
switch (argv[a][2]) { |
1297 |
> |
case 's': |
1298 |
> |
na = 2; |
1299 |
> |
break; |
1300 |
> |
case 'w': |
1301 |
> |
na = 3; |
1302 |
> |
break; |
1303 |
> |
case '\0': |
1304 |
> |
sampcnt = atoi(argv[++a]); |
1305 |
> |
if (sampcnt <= 0) |
1306 |
> |
goto userr; |
1307 |
> |
na = 0; /* we re-add this later */ |
1308 |
> |
continue; |
1309 |
> |
} |
1310 |
> |
break; |
1311 |
|
case 'I': /* only for pass-through mode */ |
1312 |
|
case 'i': |
1313 |
|
iropt = argv[a]; |
1325 |
|
case 'n': /* options with 1 argument */ |
1326 |
|
case 's': |
1327 |
|
case 'o': |
1328 |
+ |
case 't': |
1329 |
|
na = 2; |
1330 |
|
break; |
1331 |
|
case 'b': /* special case */ |