--- ray/src/util/dayfact.csh	1991/11/28 11:49:12	2.2
+++ ray/src/util/dayfact.csh	2003/02/22 02:07:30	2.5
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# SCCSid "$SunId$ LBL"
+# RCSid: $Id: dayfact.csh,v 2.5 2003/02/22 02:07:30 greg Exp $
 #
 # Interactive script to calculate daylight factors
 #
@@ -28,9 +28,9 @@ a contour plot from the result.  The input is a Radian
 (and octree) and the output is one or more color Radiance pictures.
 
 _EOF_
-echo -n "Have you already calculated an illuminance picture with dayfact? "
-if ( "$<" =~ [yY]* ) then
-	readvar illumpic
+echo "Have you already calculated an illuminance picture using dayfact?"
+readvar illumpic
+if ( $illumpic != $nofile ) then
 	if ( ! -r $illumpic ) then
 		echo "Cannot read $illumpic"
 		exit 1
@@ -136,8 +136,8 @@ if ( ! $?gotillumpic ) then
 	| rcalc -e '$1=($2+.5)/'"$wpres[1]*$wpsize[1]+$wporig[1]" \
 		-e '$2=(1-($1+.5)/'"$wpres[2])*$wpsize[2]+$wporig[2]" \
 		-e '$3='"$wporig[3]" -e '$4=0;$5=0;$6=1' \
-	| rtrace $rtargs -h+ -I+ -ov -faf $octree \
-	| pvalue -r -y $wpres[2] +x $wpres[1] -df > $temp1
+	| rtrace $rtargs -h+ -I+ -ov -fac -x $wpres[1] -y $wpres[2] $octree \
+	> $temp1
 	pfilt -h 20 -n 0 -x 300 -y 300 -p 1 -r 1 $temp1 > $illumpic
 endif
 set maxval=`getinfo < $illumpic | rcalc -i 'EXPOSURE=${e}' -e '$1=3/e'`