--- ray/src/util/genBSDF.pl	2016/07/13 00:51:17	2.64
+++ ray/src/util/genBSDF.pl	2017/02/14 07:06:55	2.75
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.64 2016/07/13 00:51:17 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.75 2017/02/14 07:06:55 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
@@ -13,11 +13,30 @@ sub userror {
 	exit 1;
 }
 my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp);
-my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz);
-if ($windoz) {
+my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph);
+my ($curphase, $recovery);
+if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
+	$td = $ARGV[1];
+	open(MYAVH, "< $td/savedARGV.txt") or die "$td: invalid path\n";
+	@ARGV = <MYAVH>;
+	close MYAVH;
+	chomp @ARGV;
+	$recovery = 0;
+	if (open(MYPH, "< $td/phase.txt")) {
+		while (<MYPH>) {
+			chomp($recovery = $_);
+		}
+		close MYPH;
+	}
+} elsif ($windoz) {
 	my $tmploc = `echo \%TMP\%`;
-	chomp($tmploc);
+	chomp $tmploc;
 	$td = mkdtemp("$tmploc\\genBSDF.XXXXXX");
+} else {
+	$td = mkdtemp("/tmp/genBSDF.XXXXXX");
+	chomp $td;
+}
+if ($windoz) {
 	$radscn = "$td\\device.rad";
 	$mgfscn = "$td\\device.mgf";
 	$octree = "$td\\device.oct";
@@ -38,11 +57,9 @@ if ($windoz) {
 	$rfz = "$td\\rfz.dat";
 	$tbz = "$td\\tbz.dat";
 	$rbz = "$td\\rbz.dat";
-	chomp $td;
+	$cph = "$td\\phase.txt";
 	$rmtmp = "rd /S /Q $td";
 } else {
-	$td = mkdtemp("/tmp/genBSDF.XXXXXX");
-	chomp $td;
 	$radscn = "$td/device.rad";
 	$mgfscn = "$td/device.mgf";
 	$octree = "$td/device.oct";
@@ -63,10 +80,11 @@ if ($windoz) {
 	$rfz = "$td/rfz.dat";
 	$tbz = "$td/tbz.dat";
 	$rbz = "$td/rbz.dat";
+	$cph = "$td/phase.txt";
 	$rmtmp = "rm -rf $td";
 }
 my @savedARGV = @ARGV;
-my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6";
+my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6 -w-";
 my $wrapper = "wrapBSDF";
 my $tensortree = 0;
 my $ttlog2 = 4;
@@ -136,91 +154,102 @@ while ($#ARGV >= 0) {
 }
 # Check that we're actually being asked to do something
 die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
-# Issue warning for unhandled reciprocity case
-print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
-		($tensortree==3 && !($doforw && $doback));
 $wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c";
 $wrapper .= " -u $gunit";
-# Get scene description and dimensions
-if ( $mgfin ) {
-	system "mgf2rad @ARGV > $radscn";
-	die "Could not load MGF input\n" if ( $? );
-} else {
-	system "xform -e @ARGV > $radscn";
-	die "Could not load Radiance input\n" if ( $? );
+if ( !defined $recovery ) {
+	# Issue warning for unhandled reciprocity case
+	print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
+			($tensortree==3 && !($doforw && $doback));
+	# Get scene description
+	if ( $mgfin ) {
+		system "mgf2rad @ARGV > $radscn";
+		die "Could not load MGF input\n" if ( $? );
+	} else {
+		system "xform -e @ARGV > $radscn";
+		die "Could not load Radiance input\n" if ( $? );
+	}
 }
-if ($#dim != 5) {
-	@dim = split ' ', `getbbox -h $radscn`;
+if ( $#dim != 5 ) {
+	@dim = split ' ', `getbbox -h -w $radscn`;
 }
-die "Device entirely inside room!\n" if ($dim[4] >= 0);
-if ($dim[5] > 1e-5) {
+die "Device entirely inside room!\n" if ( $dim[4] >= 0 );
+if ( $dim[5] > 1e-5 ) {
 	print STDERR "Warning: Device extends into room\n";
-} elsif ($dim[5]*$dim[5] < .01*($dim[1]-$dim[0])*($dim[3]-$dim[2])) {
+} elsif ( $dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2]) ) {
 	print STDERR "Warning: Device far behind Z==0 plane\n";
 }
 # Assume Zmax==0 to derive thickness so pkgBSDF will work
 $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
 		';h=' . ($dim[3] - $dim[2]) . '"';
-# Generate octree
-system "oconv -w $radscn > $octree";
-die "Could not compile scene\n" if ( $? );
-# Add MGF description if requested
-if ( $geout ) {
-	open(MGFSCN, "> $mgfscn");
-	printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
-	close MGFSCN;
-	if ( $mgfin ) {
-		system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn};
-	} else {
-		system "rad2mgf $radscn >> $mgfscn";
-	}
-	open(MGFSCN, ">> $mgfscn");
-	print MGFSCN "xf\n";
-	close MGFSCN;
-	$wrapper .= " -g $mgfscn";
-}
-# Create receiver & sender surfaces (rectangular)
+$wrapper .= " -g $mgfscn" if ( $geout );
+# Calculate CIE (u',v') from Radiance RGB:
+my $CIEuv =	'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
+		'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
+		'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
+		'den=Xi+15*Yi+3*Zi;' .
+		'uprime=4*Xi/den;vprime=9*Yi/den;' ;
 my $FEPS = 1e-5;
+my $ns = 2**$ttlog2;
 my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
 my $ny = int($nsamp/$nx + 1);
 $nsamp = $nx * $ny;
-my $ns = 2**$ttlog2;
-open(RADSCN, "> $receivers");
-print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
-print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
-print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
-print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
-print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
-print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
-print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
-print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
-close RADSCN;
-# Finish rfluxmtx command and prepare sender surfaces
 $rfluxmtx .= " -n $nproc -c $nsamp";
-if ( $tensortree != 3 ) {	# Isotropic tensor tree is exception
-	open (RADSCN, "> $fsender");
-	print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
-	print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
+if ( !defined $recovery ) {
+	open(MYAVH, "> $td/savedARGV.txt");
+	foreach (@savedARGV) {
+		print MYAVH "$_\n";
+	}
+	close MYAVH;
+	# Generate octree
+	system "oconv -w -f $radscn > $octree";
+	die "Could not compile scene\n" if ( $? );
+	# Add MGF description if requested
+	if ( $geout ) {
+		open(MGFSCN, "> $mgfscn");
+		printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
+		close MGFSCN;
+		if ( $mgfin ) {
+			system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn};
+		} else {
+			system "rad2mgf $radscn >> $mgfscn";
+		}
+		open(MGFSCN, ">> $mgfscn");
+		print MGFSCN "xf\n";
+		close MGFSCN;
+	}
+	# Create receiver & sender surfaces (rectangular)
+	open(RADSCN, "> $receivers");
+	print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
+	print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
+	print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
+	print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
+	print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
+	print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
+	print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
+	print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
 	close RADSCN;
-	open (RADSCN, "> $bsender");
-	print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
-	print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
-	printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
-	close RADSCN;
+	# Prepare sender surfaces
+	if ( $tensortree != 3 ) {	# Isotropic tensor tree is exception
+		open (RADSCN, "> $fsender");
+		print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
+		print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
+		close RADSCN;
+		open (RADSCN, "> $bsender");
+		print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
+		print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
+		printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
+		close RADSCN;
+	}
+	print STDERR "Recover using: $0 -recover $td\n";
 }
-# Calculate CIE (u',v') from Radiance RGB:
-my $CIEuv =	'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
-		'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
-		'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
-		'den=Xi+15*Yi+3*Zi;' .
-		'uprime=4*Xi/den;vprime=9*Yi/den;' ;
+$curphase = 0;
 # Create data segments (all the work happens here)
 if ( $tensortree ) {
 	do_tree_bsdf();
@@ -234,8 +263,39 @@ die "Could not wrap BSDF data\n" if ( $? );
 # Clean up temporary files and exit
 exec $rmtmp;
 
-#-------------- End of main program segment --------------#
+#============== End of main program segment ==============#
 
+# Function to determine if next phase should be skipped or recovered
+sub do_phase {
+	$curphase++;
+	if ( defined $recovery ) {
+		if ( $recovery > $curphase ) { return 0; }
+		if ( $recovery == $curphase ) { return -1; }
+	}
+	open(MYPH, ">> $td/phase.txt");
+	print MYPH "$curphase\n";
+	close MYPH;
+	return 1;
+}
+
+# Check if we are in active phase (not skipping parts)
+sub active_phase {
+	if ( defined $recovery ) {
+		if ( $recovery > $curphase ) { return 0; }
+		if ( $recovery == $curphase ) { return -1; }
+	}
+	return 1;
+}
+
+# Function to run program and check output if in active phase
+sub run_check {
+	if ( !active_phase() ) { return; }
+	my $cmd = shift;
+	# print STDERR "Running: $cmd\n";
+	system $cmd;
+	die "Failure running: $cmd\n" if ( $? );
+}
+
 #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
 sub do_tree_bsdf {
 
@@ -248,6 +308,8 @@ sub do_tree_bsdf {
 # Call rfluxmtx and process tensor tree BSDF for the given direction
 sub do_ttree_dir {
 	my $forw = shift;
+	my $dop = do_phase();
+	my $r = ($dop < 0) ? " -r" : "";
 	my $cmd;
 	if ( $tensortree == 3 ) {
 		# Isotropic BSDF
@@ -263,32 +325,34 @@ sub do_ttree_dir {
 				qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
 				qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } .
 				qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } .
-				"| $rfluxmtx -fa -y $ns2 - $receivers -i $octree";
+				"| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
 		} else {
 			$cmd = "cnt $ns2 $ny $nx " .
-				qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
-				qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
-				qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
-				qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
-				qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
-				qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
-				qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
+				qq{| rcalc -e 'r1=rand(.8681*recno-.673892)' } .
+				qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
+				qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
+				qq{-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' } .
+				qq{-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
+				qq{-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
+				qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
 				qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
 				qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
-				"| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree";
+				"| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
 		}
 	} else {
 		# Anisotropic BSDF
 		my $sender = ($bsender,$fsender)[$forw];
 		if ($windoz) {
-			$cmd = "$rfluxmtx -fa $sender $receivers -i $octree";
+			$cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree";
 		} else {
-			$cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree";
+			$cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
 		}
 	}
-	# print STDERR "Starting: $cmd\n";
-	system $cmd;
-	die "Failure running rfluxmtx" if ( $? );
+	if ( $dop ) {
+		# print STDERR "Running: $cmd\n";
+		system $cmd;
+		die "Failure running rfluxmtx" if ( $? );
+	}
 	ttree_out($forw);
 }	# end of do_ttree_dir()
 
@@ -371,27 +435,27 @@ sub ttree_comp {
 			$cmd .= " -of $src " .
 					"| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
 		}
-		# print STDERR "Running: $cmd\n";
-		system "$cmd > $dest";
-		die "Failure running rttree_reduce" if ( $? );
+		run_check "$cmd > $dest";
 	} else {
 		if ($windoz) {
 			$cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
 		} else {
 			$cmd .= " $src";
 		}
-		open(DATOUT, "> $dest");
-		print DATOUT "{\n";
-		close DATOUT;
-		# print STDERR "Running: $cmd\n";
-		system "$cmd >> $dest";
-		die "Failure running rcalc" if ( $? );
-		open(DATOUT, ">> $dest");
-		for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
-			print DATOUT "0\n";
+		if ( active_phase() ) {
+			open(DATOUT, "> $dest");
+			print DATOUT "{\n";
+			close DATOUT;
+			# print STDERR "Running: $cmd\n";
+			system "$cmd >> $dest";
+			die "Failure running rcalc" if ( $? );
+			open(DATOUT, ">> $dest");
+			for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
+				print DATOUT "0\n";
+			}
+			print DATOUT "}\n";
+			close DATOUT;
 		}
-		print DATOUT "}\n";
-		close DATOUT;
 	}
 	if ( "$spec" ne "$curspec" ) {
 		$wrapper .= " -s $spec";
@@ -414,12 +478,15 @@ sub do_matrix_bsdf {
 # Call rfluxmtx and process tensor tree BSDF for the given direction
 sub do_matrix_dir {
 	my $forw = shift;
-	my $cmd;
+	my $dop = do_phase();
+	my $r = ($dop < 0) ? " -r" : "";
 	my $sender = ($bsender,$fsender)[$forw];
-	$cmd = "$rfluxmtx -fd $sender $receivers -i $octree";
-	# print STDERR "Starting: $cmd\n";
-	system $cmd;
-	die "Failure running rfluxmtx" if ( $? );
+	my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
+	if ( $dop ) {
+		# print STDERR "Running: $cmd\n";
+		system $cmd;
+		die "Failure running rfluxmtx" if ( $? );
+	}
 	matrix_out($forw);
 }	# end of do_matrix_dir()
 
@@ -463,10 +530,8 @@ sub matrix_comp {
 	} elsif ("$spec" eq "CIE-Z") {
 		$cmd .= " -c 0.0241 0.1229 0.8530";
 	}
-	$cmd .= " $src | rcollate -ho -oc 145";
-	# print STDERR "Running: $cmd\n";
-	system "$cmd > $dest";
-	die "Failure running rmtxop" if ( $? );
+	$cmd .= " $src | getinfo -";
+	run_check "$cmd > $dest";
 	if ( "$spec" ne "$curspec" ) {
 		$wrapper .= " -s $spec";
 		$curspec = $spec;