--- ray/src/util/dayfact.csh	1991/06/05 10:04:24	1.1
+++ ray/src/util/dayfact.csh	1991/06/05 14:01:20	1.4
@@ -8,18 +8,18 @@ set genskyf=$nofile
 set octree=$nofile
 set dfpict=$nofile
 set ilpict=$nofile
+set fcopts=($*)
 set wporig=(0 0 0)
 set wpsize=(1 1)
 set rtargs=(-ab 1 -ad 256 -as 128 -aa .15 -av .1 .1 .1)
 
-set maxres=64
+set maxres=128
 set iltemp=/usr/tmp/il$$.pic
-set tempfiles=($iltemp)
+set sctemp=/usr/tmp/sc$$.csh
+set tempfiles=($iltemp $sctemp)
 
 alias readvar 'echo -n Enter \!:1 "[$\!:1]: ";set ans="$<";if("$ans" != "")set \!:1="$ans"'
 
-onintr quit
-
 cat <<_EOF_
 			DAYLIGHT FACTOR CALCULATION
 
@@ -35,17 +35,16 @@ if ( "$octree" == "$nofile" || ! -f "$octree" ) then
 	echo "before running this script."
 	exit 1
 endif
-echo ""
 echo "In what scene file is the gensky command located?"
 readvar genskyf
-if ( "$genskyf" == "$none" || ! -r "$genskyf" ) then
+if ( "$genskyf" == "$nofile" || ! -r "$genskyf" ) then
 	echo "You will not be able to compute"
 	echo "daylight factors without a gensky file"
 else
 	set extamb=`xform -e $genskyf|sed -n 's/^# Ground ambient level: //p'`
 endif
-echo "Is the z-axis your zenith direction?"
-if ( "$ans" !~ [yY]* ) then
+echo -n "Is the z-axis your zenith direction? "
+if ( "$<" !~ [yY]* ) then
 	echo "I'm sorry, you cannot use this script"
 	exit 1
 endif
@@ -53,7 +52,7 @@ echo "What is the origin (smallest x y z coordinates) 
 readvar wporig
 set wporig=($wporig)
 echo "What is the x and y size (width and length) of the workplane?"
-read wpsize
+readvar wpsize
 set wpsize=($wpsize)
 set wpres=(`rcalc -n -e '$1=if(l,'"floor($maxres*$wpsize[1]/$wpsize[2]),$maxres);"'$2=if(l,'"$maxres,floor($maxres*$wpsize[2]/$wpsize[1]));l=$wpsize[2]-$wpsize[1]"`)
 set rtargs=($rtargs -ar `getinfo -d<$octree|rcalc -e '$1=floor(16*$4/'"($wpsize[1]+$wpsize[2]))"`)
@@ -70,23 +69,30 @@ if ( "$ilpict" == "$nofile" && "$dfpict" == "$nofile" 
 	echo "Since you don't want any output, I guess we're done."
 	exit 0
 endif
-echo "Starting rtrace calculation -- this will take some time..."
-cnt $wpres | rcalc -e '$1=($1+.5)/'"$wpres[1]*$wpsize[1]+$wporig[1]" \
-		-e '$2=(1-($2+.5)/$wpres[2])*$wpsize[2]+$wporig[2]" \
-		-e '$3='"$wporig[3]" -e "$4=0;$5=0;$6=1" \
+cat <<'_EOF_' > $sctemp
+onintr quit
+echo "Your dayfact job is finished."
+echo "Please check for error messages below."
+echo ""
+set echo
+cnt $wpres[2] $wpres[1] \
+	| 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 -I -ov -faf $octree \
 	| pvalue -r -x $wpres[1] -y $wpres[2] -df \
-	| pfilt -h 20 -n 0 -x 512 -y 512 -p 1 -r .7 > $iltemp
+	| pfilt -h 20 -n 0 -x 350 -y 350 -p 1 -r 1 > $iltemp
 set maxval=`getinfo < $iltemp | rcalc -i 'EXPOSURE=${e}' -e '$1=3/e'`
+'_EOF_'
 if ( "$ilpict" != "$nofile" ) then
-	echo "Making illuminance contour picture $ilpict..."
-	falsecolor -s "$maxval*470" -l Lux -log 2 -cl -pi $iltemp > $ilpict
+	echo 'falsecolor -cb -l Lux $fcopts -s "$maxval*470" -m 470 \\
+		-pi $iltemp > $ilpict' >> $sctemp
 endif
 if ( "$dfpict" != "$nofile" ) then
-	echo "Making daylight factor contour picture $dfpict..."
-	falsecolor -s "$maxval/$extamb" -m "1/$extamb" -l DF \
-		-log 2 -cl -pi $iltemp > $dfpict
+	echo 'falsecolor -cb -l DF $fcopts -s "$maxval/$extamb" \\
+		-m "1/$extamb" -pi $iltemp > $dfpict' >> $sctemp
 endif
-echo "Done."
-quit:
-	rm -f $tempfiles
+echo 'rm -f $tempfiles' >> $sctemp
+(source $sctemp) |& mail `whoami` &
+echo "Your job is started in the background."
+echo "I will send you mail when it is done."