--- ray/src/util/dayfact.csh	1991/06/05 14:01:20	1.4
+++ ray/src/util/dayfact.csh	1991/11/12 17:19:31	2.1
@@ -12,11 +12,7 @@ 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=128
-set iltemp=/usr/tmp/il$$.pic
-set sctemp=/usr/tmp/sc$$.csh
-set tempfiles=($iltemp $sctemp)
 
 alias readvar 'echo -n Enter \!:1 "[$\!:1]: ";set ans="$<";if("$ans" != "")set \!:1="$ans"'
 
@@ -31,16 +27,18 @@ or more color Radiance pictures.
 _EOF_
 readvar octree
 if ( "$octree" == "$nofile" || ! -f "$octree" ) then
-	echo "You must first create an octree with oconv"
-	echo "before running this script."
+	echo "You must first create an octree with"
+	echo "oconv before running this script."
 	exit 1
 endif
+set title="$octree:r"
 echo "In what scene file is the gensky command located?"
 readvar genskyf
 if ( "$genskyf" == "$nofile" || ! -r "$genskyf" ) then
-	echo "You will not be able to compute"
-	echo "daylight factors without a gensky file"
+	echo "You will not be able to compute daylight"
+	echo "factors since there is no gensky file."
 else
+	set title=$title\ `sed -n 's/^.*gensky  *\([0-9][0-9]*  *[0-9][0-9]*  *[0-9][0-9.]*\).*$/\1/p' $genskyf`
 	set extamb=`xform -e $genskyf|sed -n 's/^# Ground ambient level: //p'`
 endif
 echo -n "Is the z-axis your zenith direction? "
@@ -57,7 +55,7 @@ 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]))"`)
 echo "What calculation options do you want to give to rtrace?"
-echo "(It is very important to set the -a? options correctly.)"
+echo "(It is very important to set the -a* options correctly.)"
 readvar rtargs
 echo "Illuminance contour picture if you want one"
 readvar ilpict
@@ -69,8 +67,13 @@ if ( "$ilpict" == "$nofile" && "$dfpict" == "$nofile" 
 	echo "Since you don't want any output, I guess we're done."
 	exit 0
 endif
+echo "Title for output picture"
+readvar title
+set sctemp=/usr/tmp/sc$$.csh
 cat <<'_EOF_' > $sctemp
-onintr quit
+set iltemp=/usr/tmp/il$$.pic
+set tltemp=/usr/tmp/tl$$.pic
+set tempfiles=($iltemp $sctemp $tltemp)
 echo "Your dayfact job is finished."
 echo "Please check for error messages below."
 echo ""
@@ -79,20 +82,23 @@ 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 \
+	| rtrace $rtargs -h+ -I+ -ov -faf $octree \
 	| pvalue -r -x $wpres[1] -y $wpres[2] -df \
 	| 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'`
+psign -h 50 " $title " | pfilt -1 -x /2 -y /2 > $tltemp
 '_EOF_'
 if ( "$ilpict" != "$nofile" ) then
-	echo 'falsecolor -cb -l Lux $fcopts -s "$maxval*470" -m 470 \\
-		-pi $iltemp > $ilpict' >> $sctemp
+	echo 'falsecolor -cb -l Lux -s "$maxval*470" \\
+		$fcopts -m 470 -ip $iltemp \\
+		| pcompos -a 1 - $tltemp > $ilpict' >> $sctemp
 endif
 if ( "$dfpict" != "$nofile" ) then
-	echo 'falsecolor -cb -l DF $fcopts -s "$maxval/$extamb" \\
-		-m "1/$extamb" -pi $iltemp > $dfpict' >> $sctemp
+	echo 'falsecolor -cb -l DF -s 100 \\
+		$fcopts -m "100/PI/$extamb" -ip $iltemp \\
+		| pcompos -a 1 - $tltemp > $dfpict' >> $sctemp
 endif
 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."
+echo "You will be notified by mail when it is done."