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.); |
612 |
|
overture = 0; |
613 |
|
switch (vscale(VARIABILITY)) { |
614 |
|
case LOW: |
615 |
< |
op = addarg(op, "-aa .4 -ad 64"); |
615 |
> |
op = addarg(op, "-aw 128 -aa .4 -ad 64"); |
616 |
|
break; |
617 |
|
case MEDIUM: |
618 |
< |
op = addarg(op, "-aa .3 -ad 128"); |
618 |
> |
op = addarg(op, "-aw 1024 -aa .3 -ad 128"); |
619 |
|
break; |
620 |
|
case HIGH: |
621 |
|
op = addarg(op, "-aa .25 -ad 256"); |
691 |
|
overture = 0; |
692 |
|
switch (vscale(VARIABILITY)) { |
693 |
|
case LOW: |
694 |
< |
op = addarg(op, "-aa .25 -ad 196 -as 0"); |
694 |
> |
op = addarg(op, "-aw 128 -aa .25 -ad 196 -as 0"); |
695 |
|
break; |
696 |
|
case MEDIUM: |
697 |
< |
op = addarg(op, "-aa .2 -ad 400 -as 64"); |
697 |
> |
op = addarg(op, "-aw 1024 -aa .2 -ad 400 -as 64"); |
698 |
|
break; |
699 |
|
case HIGH: |
700 |
|
op = addarg(op, "-aa .15 -ad 768 -as 196"); |
767 |
|
overture = 0; |
768 |
|
switch (vscale(VARIABILITY)) { |
769 |
|
case LOW: |
770 |
< |
op = addarg(op, "-aa .15 -ad 256 -as 0"); |
770 |
> |
op = addarg(op, "-aw 128 -aa .15 -ad 256 -as 0"); |
771 |
|
break; |
772 |
|
case MEDIUM: |
773 |
< |
op = addarg(op, "-aa .125 -ad 512 -as 256"); |
773 |
> |
op = addarg(op, "-aw 1024 -aa .125 -ad 512 -as 256"); |
774 |
|
break; |
775 |
|
case HIGH: |
776 |
|
op = addarg(op, "-aa .08 -ad 1024 -as 512"); |
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 != '-') |