535 |
|
{ |
536 |
|
if (vdef(EXPOSURE)) { |
537 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
538 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
539 |
< |
return(.5/atof(vval(EXPOSURE))); |
538 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
539 |
> |
return(.5/vflt(EXPOSURE)); |
540 |
|
} |
541 |
|
if (vlet(ZONE) == 'E') |
542 |
|
return(10.); |
796 |
|
return; |
797 |
|
if (vdef(OPTFILE)) { |
798 |
|
for (cp = ro; cp[1]; cp++) |
799 |
< |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
799 |
> |
if (isspace(cp[1]) && (cp[2] == '@' || |
800 |
> |
(cp[2] == '-' && isalpha(cp[3])))) |
801 |
|
*cp = '\n'; |
802 |
|
else |
803 |
|
*cp = cp[1]; |
995 |
|
} |
996 |
|
/* view number? */ |
997 |
|
if (isint(viewselect)) |
998 |
< |
return(specview(nvalue(vv+VIEW, atoi(viewselect)-1))); |
998 |
> |
return(specview(nvalue(VIEW, atoi(viewselect)-1))); |
999 |
|
/* check list */ |
1000 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1000 |
> |
while ((mv = nvalue(VIEW, n++)) != NULL) |
1001 |
|
if (matchword(viewselect, mv)) |
1002 |
|
return(specview(mv)); |
1003 |
|
return(specview(viewselect)); /* standard view? */ |
1004 |
|
} |
1005 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1005 |
> |
mv = nvalue(VIEW, n); /* use view n */ |
1006 |
|
if (vn != NULL & mv != NULL) { |
1007 |
|
register char *mv2 = mv; |
1008 |
|
if (*mv2 != '-') |