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

Comparing ray/src/util/genBSDF.pl (file contents):
Revision 2.69 by greg, Fri Sep 16 22:42:42 2016 UTC vs.
Revision 2.72 by greg, Fri Oct 14 00:54:22 2016 UTC

# Line 275 | Line 275 | exec $rmtmp;
275   # Function to determine if next phase should be skipped or recovered
276   sub do_phase {
277          $curphase++;
278 <        if (defined $recovery) {
279 <                if ($recovery > $curphase) { return 0; }
280 <                if ($recovery == $curphase) { return -1; }
278 >        if ( defined $recovery ) {
279 >                if ( $recovery > $curphase ) { return 0; }
280 >                if ( $recovery == $curphase ) { return -1; }
281          }
282          print MYPH "$curphase\n";
283          return 1;
284   }
285  
286 + # Check if we are in active phase (not skipping parts)
287 + sub active_phase {
288 +        if ( defined $recovery ) {
289 +                if ( $recovery > $curphase ) { return 0; }
290 +                if ( $recovery == $curphase ) { return -1; }
291 +        }
292 +        return 1;
293 + }
294 +
295 + # Function to run program and check output if in active phase
296 + sub run_check {
297 +        if ( !active_phase() ) { return; }
298 +        my $cmd = shift;
299 +        # print STDERR "Running: $cmd\n";
300 +        system $cmd;
301 +        die "Failure running: $cmd\n" if ( $? );
302 + }
303 +
304   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
305   sub do_tree_bsdf {
306  
# Line 295 | Line 313 | sub do_tree_bsdf {
313   # Call rfluxmtx and process tensor tree BSDF for the given direction
314   sub do_ttree_dir {
315          my $forw = shift;
316 <        my $r = do_phase();
317 <        if (!$r) { return; }
300 <        $r = ($r < 0) ? " -r" : "";
316 >        my $dop = do_phase();
317 >        my $r = ($dop < 0) ? " -r" : "";
318          my $cmd;
319          if ( $tensortree == 3 ) {
320                  # Isotropic BSDF
# Line 336 | Line 353 | sub do_ttree_dir {
353                          $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
354                  }
355          }
356 <        # print STDERR "Starting: $cmd\n";
357 <        system $cmd;
358 <        die "Failure running rfluxmtx" if ( $? );
356 >        if ( $dop ) {
357 >                # print STDERR "Running: $cmd\n";
358 >                system $cmd;
359 >                die "Failure running rfluxmtx" if ( $? );
360 >        }
361          ttree_out($forw);
362   }       # end of do_ttree_dir()
363  
# Line 421 | Line 440 | sub ttree_comp {
440                          $cmd .= " -of $src " .
441                                          "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
442                  }
443 <                # print STDERR "Running: $cmd\n";
425 <                system "$cmd > $dest";
426 <                die "Failure running rttree_reduce" if ( $? );
443 >                run_check "$cmd > $dest";
444          } else {
445                  if ($windoz) {
446                          $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
447                  } else {
448                          $cmd .= " $src";
449                  }
450 <                open(DATOUT, "> $dest");
451 <                print DATOUT "{\n";
452 <                close DATOUT;
453 <                # print STDERR "Running: $cmd\n";
454 <                system "$cmd >> $dest";
455 <                die "Failure running rcalc" if ( $? );
456 <                open(DATOUT, ">> $dest");
457 <                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
458 <                        print DATOUT "0\n";
450 >                if ( active_phase() ) {
451 >                        open(DATOUT, "> $dest");
452 >                        print DATOUT "{\n";
453 >                        close DATOUT;
454 >                        # print STDERR "Running: $cmd\n";
455 >                        system "$cmd >> $dest";
456 >                        die "Failure running rcalc" if ( $? );
457 >                        open(DATOUT, ">> $dest");
458 >                        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
459 >                                print DATOUT "0\n";
460 >                        }
461 >                        print DATOUT "}\n";
462 >                        close DATOUT;
463                  }
443                print DATOUT "}\n";
444                close DATOUT;
464          }
465          if ( "$spec" ne "$curspec" ) {
466                  $wrapper .= " -s $spec";
# Line 464 | Line 483 | sub do_matrix_bsdf {
483   # Call rfluxmtx and process tensor tree BSDF for the given direction
484   sub do_matrix_dir {
485          my $forw = shift;
486 <        my $r = do_phase();
487 <        if (!$r) { return; }
469 <        $r = ($r < 0) ? " -r" : "";
470 <        my $cmd;
486 >        my $dop = do_phase();
487 >        my $r = ($dop < 0) ? " -r" : "";
488          my $sender = ($bsender,$fsender)[$forw];
489 <        $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
490 <        # print STDERR "Starting: $cmd\n";
491 <        system $cmd;
492 <        die "Failure running rfluxmtx" if ( $? );
489 >        my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
490 >        if ( $dop ) {
491 >                # print STDERR "Running: $cmd\n";
492 >                system $cmd;
493 >                die "Failure running rfluxmtx" if ( $? );
494 >        }
495          matrix_out($forw);
496   }       # end of do_matrix_dir()
497  
# Line 516 | Line 535 | sub matrix_comp {
535          } elsif ("$spec" eq "CIE-Z") {
536                  $cmd .= " -c 0.0241 0.1229 0.8530";
537          }
538 <        $cmd .= " $src | rcollate -ho -oc 145";
539 <        # print STDERR "Running: $cmd\n";
521 <        system "$cmd > $dest";
522 <        die "Failure running rmtxop" if ( $? );
538 >        $cmd .= " $src | getinfo -";
539 >        run_check "$cmd > $dest";
540          if ( "$spec" ne "$curspec" ) {
541                  $wrapper .= " -s $spec";
542                  $curspec = $spec;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines