--- ray/src/util/genBSDF.pl 2016/09/19 16:20:08 2.70 +++ ray/src/util/genBSDF.pl 2017/01/31 23:13:17 2.73 @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# RCSid $Id: genBSDF.pl,v 2.70 2016/09/19 16:20:08 greg Exp $ +# RCSid $Id: genBSDF.pl,v 2.73 2017/01/31 23:13:17 greg Exp $ # # Compute BSDF based on geometry and material description # @@ -249,13 +249,6 @@ if ( !defined $recovery ) { } print STDERR "Recover using: $0 -recover $td\n"; } -# Open unbuffered progress file -open(MYPH, ">> $td/phase.txt"); -{ - my $ofh = select MYPH; - $| = 1; - select $ofh; -} $curphase = 0; # Create data segments (all the work happens here) if ( $tensortree ) { @@ -279,7 +272,9 @@ sub do_phase { if ( $recovery > $curphase ) { return 0; } if ( $recovery == $curphase ) { return -1; } } + open(MYPH, ">> $td/phase.txt"); print MYPH "$curphase\n"; + close MYPH; return 1; } @@ -353,7 +348,11 @@ sub do_ttree_dir { $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree"; } } - run_check $cmd; + if ( $dop ) { + # print STDERR "Running: $cmd\n"; + system $cmd; + die "Failure running rfluxmtx" if ( $? ); + } ttree_out($forw); } # end of do_ttree_dir() @@ -482,7 +481,12 @@ sub do_matrix_dir { my $dop = do_phase(); my $r = ($dop < 0) ? " -r" : ""; my $sender = ($bsender,$fsender)[$forw]; - run_check "$rfluxmtx$r -fd $sender $receivers -i $octree"; + 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() @@ -526,7 +530,7 @@ sub matrix_comp { } elsif ("$spec" eq "CIE-Z") { $cmd .= " -c 0.0241 0.1229 0.8530"; } - $cmd .= " $src | rcollate -ho -oc 145"; + $cmd .= " $src | getinfo -"; run_check "$cmd > $dest"; if ( "$spec" ne "$curspec" ) { $wrapper .= " -s $spec";