ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/genBSDF.pl
(Generate patch)

Comparing ray/src/util/genBSDF.pl (file contents):
Revision 2.70 by greg, Mon Sep 19 16:20:08 2016 UTC vs.
Revision 2.73 by greg, Tue Jan 31 23:13:17 2017 UTC

# Line 249 | Line 249 | if ( !defined $recovery ) {
249          }
250          print STDERR "Recover using: $0 -recover $td\n";
251   }
252 – # Open unbuffered progress file
253 – open(MYPH, ">> $td/phase.txt");
254 – {
255 –        my $ofh = select MYPH;
256 –        $| = 1;
257 –        select $ofh;
258 – }
252   $curphase = 0;
253   # Create data segments (all the work happens here)
254   if ( $tensortree ) {
# Line 279 | Line 272 | sub do_phase {
272                  if ( $recovery > $curphase ) { return 0; }
273                  if ( $recovery == $curphase ) { return -1; }
274          }
275 +        open(MYPH, ">> $td/phase.txt");
276          print MYPH "$curphase\n";
277 +        close MYPH;
278          return 1;
279   }
280  
# Line 353 | Line 348 | sub do_ttree_dir {
348                          $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
349                  }
350          }
351 <        run_check $cmd;
351 >        if ( $dop ) {
352 >                # print STDERR "Running: $cmd\n";
353 >                system $cmd;
354 >                die "Failure running rfluxmtx" if ( $? );
355 >        }
356          ttree_out($forw);
357   }       # end of do_ttree_dir()
358  
# Line 482 | Line 481 | sub do_matrix_dir {
481          my $dop = do_phase();
482          my $r = ($dop < 0) ? " -r" : "";
483          my $sender = ($bsender,$fsender)[$forw];
484 <        run_check "$rfluxmtx$r -fd $sender $receivers -i $octree";
484 >        my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
485 >        if ( $dop ) {
486 >                # print STDERR "Running: $cmd\n";
487 >                system $cmd;
488 >                die "Failure running rfluxmtx" if ( $? );
489 >        }
490          matrix_out($forw);
491   }       # end of do_matrix_dir()
492  
# Line 526 | Line 530 | sub matrix_comp {
530          } elsif ("$spec" eq "CIE-Z") {
531                  $cmd .= " -c 0.0241 0.1229 0.8530";
532          }
533 <        $cmd .= " $src | rcollate -ho -oc 145";
533 >        $cmd .= " $src | getinfo -";
534          run_check "$cmd > $dest";
535          if ( "$spec" ne "$curspec" ) {
536                  $wrapper .= " -s $spec";

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)