--- ray/src/px/pacuity.csh 1996/09/20 16:44:01 3.1 +++ ray/src/px/pacuity.csh 1996/09/23 09:49:56 3.2 @@ -37,7 +37,7 @@ tabfunc -i acuity > $tfc1 << EOF EOF set pres=(`getinfo -d < $ifile | sed 's/^-Y \([1-9][0-9]*\) +X \([1-9][0-9]*\)$/\2 \1/'`) set vp=`vwright V < $ifile` -set aext=(`pextrem -o $ifile | rcalc -f $tfc1 -e '$1=acuity(log10(179*(.265*$3+.67*$4+.065*$5)))'`) +set aext=(`pextrem -o $ifile | rcalc -f $tfc1 -e 'max(a,b):if(a-b,a,b);$1=acuity(log10(max(179*(.265*$3+.67*$4+.065*$5),1e-4)))'`) ( rcalc -e "$vp" -e "A:3879*sqrt(Vhn/$pres[1]*Vvn/$pres[2])" \ -e 'f=60/A/2/$1;cond=if(1.5-$1,1,if(1-f,-1,if($1-'"$aext[2]"',-1,$1-'"$aext[1])))" \ -o 'pfilt -1 -r 2 -x /${f} -y /${f} '"$ifile | pfilt -1 -r 1 -x $pres[1] -y $pres[2] > $td/"'c${$1}d'$$.pic \ @@ -50,7 +50,8 @@ set aext=(`pextrem -o $ifile | rcalc -f $tfc1 -e '$1=a 32 EOF cat >> $tfc1 << _EOF_ -target_acuity = acuity(log10(WE/le(1)*li(1))); +max(a,b) : if(a-b, a, b); +target_acuity = acuity(log10(max(WE/le(1)*li(1),1e-4))); findfuzzy(i) = if(target_acuity-picture_acuity(i),i,if(i-1.5,findfuzzy(i-1),1)); fuzzy_picture = findfuzzy(nfiles-1); clear_picture = fuzzy_picture + 1;