--- ray/src/px/pdfblur.csh	2003/02/22 02:07:27	2.5
+++ ray/src/px/pdfblur.csh	2005/01/18 01:37:43	2.6
@@ -1,18 +1,17 @@
 #!/bin/csh -f
-# RCSid: $Id: pdfblur.csh,v 2.5 2003/02/22 02:07:27 greg Exp $
+# RCSid: $Id: pdfblur.csh,v 2.6 2005/01/18 01:37:43 greg Exp $
 #
 # Generate views for depth-of-field blurring on picture
 #
-if ($#argv != 4) then
-	echo "Usage: $0 aperture distance nsamp viewfile" >/dev/tty
+if ($#argv != 3) then
+	echo "Usage: $0 aperture nsamp viewfile"
 	exit 1
 endif
 set a = "$1"
-set d = "$2"
-set n = "$3"
-set vf = "$4"
+set n = "$2"
+set vf = "$3"
 cnt $n | rcalc -e `vwright i < $vf` \
--e "M:$n/5+1;a:$a/2;d:$d;N:$n;" -e 'tmax:PI*a*(M+1)' \
+-e "M:$n/5+1;a:$a/2;N:$n;" -e 'tmax:PI*a*(M+1)' \
 -e 't=tmax/N*($1+rand($1))' \
 -e 'theta=2*M*PI/(M-1)*(M-sqrt(M*M-(M-1)/(PI*a)*t))' \
 -e 'r=a*(1-(M-1)/(2*M*M*PI)*theta)' \
@@ -20,5 +19,5 @@ cnt $n | rcalc -e `vwright i < $vf` \
 -e 'opx=ipx+rcost*ihx+rsint*ivx' \
 -e 'opy=ipy+rcost*ihy+rsint*ivy' \
 -e 'opz=ipz+rcost*ihz+rsint*ivz' \
--e 'os=is-rcost/(d*ihn);ol=il-rsint/(d*ivn)' \
+-e 'os=is-rcost/(id*ihn);ol=il-rsint/(id*ivn)' \
 -o 'VIEW= -vp ${opx} ${opy} ${opz} -vs ${os} -vl ${ol}'