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.64 by greg, Wed Jul 13 00:51:17 2016 UTC vs.
Revision 2.88 by greg, Mon Jan 24 17:49:32 2022 UTC

# Line 9 | Line 9 | use strict;
9   my $windoz = ($^O eq "MSWin32" or $^O eq "MSWin64");
10   use File::Temp qw/ :mktemp  /;
11   sub userror {
12 <        print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-W][-t{3|4} Nlog2][-r \"ropts\"][-s \"x=string;y=string\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}C][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
12 >        print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-W][-t{3|4} Nlog2][-r \"ropts\"][-s \"x=string;y=string\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}C][{+|-}a][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
13          exit 1;
14   }
15   my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp);
16 < my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz);
17 < if ($windoz) {
16 > my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph);
17 > my ($curphase, $recovery);
18 > if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
19 >        $td = $ARGV[1];
20 >        open(MYAVH, "< $td/savedARGV.txt") or die "$td: invalid path\n";
21 >        @ARGV = <MYAVH>;
22 >        close MYAVH;
23 >        chomp @ARGV;
24 >        $recovery = 0;
25 >        if (open(MYPH, "< $td/phase.txt")) {
26 >                while (<MYPH>) {
27 >                        chomp($recovery = $_);
28 >                }
29 >                close MYPH;
30 >        }
31 > } elsif ($windoz) {
32          my $tmploc = `echo \%TMP\%`;
33 <        chomp($tmploc);
33 >        chomp $tmploc;
34          $td = mkdtemp("$tmploc\\genBSDF.XXXXXX");
35 + } else {
36 +        $td = mkdtemp("/tmp/genBSDF.XXXXXX");
37 +        chomp $td;
38 + }
39 + if ($windoz) {
40          $radscn = "$td\\device.rad";
41          $mgfscn = "$td\\device.mgf";
42          $octree = "$td\\device.oct";
# Line 38 | Line 57 | if ($windoz) {
57          $rfz = "$td\\rfz.dat";
58          $tbz = "$td\\tbz.dat";
59          $rbz = "$td\\rbz.dat";
60 <        chomp $td;
60 >        $cph = "$td\\phase.txt";
61          $rmtmp = "rd /S /Q $td";
62   } else {
44        $td = mkdtemp("/tmp/genBSDF.XXXXXX");
45        chomp $td;
63          $radscn = "$td/device.rad";
64          $mgfscn = "$td/device.mgf";
65          $octree = "$td/device.oct";
# Line 63 | Line 80 | if ($windoz) {
80          $rfz = "$td/rfz.dat";
81          $tbz = "$td/tbz.dat";
82          $rbz = "$td/rbz.dat";
83 +        $cph = "$td/phase.txt";
84          $rmtmp = "rm -rf $td";
85   }
86   my @savedARGV = @ARGV;
87 < my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6";
87 > my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6 -w-";
88   my $wrapper = "wrapBSDF";
89   my $tensortree = 0;
90   my $ttlog2 = 4;
91 + my $dorecip = 1;
92   my $nsamp = 2000;
93   my $mgfin = 0;
94   my $geout = 1;
# Line 97 | Line 116 | while ($#ARGV >= 0) {
116                  shift @ARGV;
117          } elsif ("$ARGV[0]" =~ /^[-+]C/) {
118                  $docolor = ("$ARGV[0]" =~ /^\+/);
119 +        } elsif ("$ARGV[0]" =~ /^[-+]a/) {
120 +                $dorecip = ("$ARGV[0]" =~ /^\+/);
121          } elsif ("$ARGV[0]" =~ /^[-+]f/) {
122                  $doforw = ("$ARGV[0]" =~ /^\+/);
123          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
# Line 136 | Line 157 | while ($#ARGV >= 0) {
157   }
158   # Check that we're actually being asked to do something
159   die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
139 # Issue warning for unhandled reciprocity case
140 print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
141                ($tensortree==3 && !($doforw && $doback));
160   $wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c";
161   $wrapper .= " -u $gunit";
162 < # Get scene description and dimensions
163 < if ( $mgfin ) {
164 <        system "mgf2rad @ARGV > $radscn";
165 <        die "Could not load MGF input\n" if ( $? );
166 < } else {
167 <        system "xform -e @ARGV > $radscn";
168 <        die "Could not load Radiance input\n" if ( $? );
162 > if ( !defined $recovery ) {
163 >        # Issue warning for unhandled reciprocity case
164 >        print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
165 >                        ($tensortree==3 && !($doforw && $doback));
166 >        # Get scene description
167 >        if ( $mgfin ) {
168 >                system "mgf2rad @ARGV > $radscn";
169 >                die "Could not load MGF input\n" if ( $? );
170 >        } else {
171 >                system "xform -e @ARGV > $radscn";
172 >                die "Could not load Radiance input\n" if ( $? );
173 >        }
174   }
175 < if ($#dim != 5) {
176 <        @dim = split ' ', `getbbox -h $radscn`;
175 > if ( $#dim != 5 ) {
176 >        @dim = split ' ', `getbbox -h -w $radscn`;
177   }
178 < die "Device entirely inside room!\n" if ($dim[4] >= 0);
179 < if ($dim[5] > 1e-5) {
178 > die "Device entirely inside room!\n" if ( $dim[4] >= 0 );
179 > if ( $dim[5] > 1e-5 ) {
180          print STDERR "Warning: Device extends into room\n";
181 < } elsif ($dim[5]*$dim[5] < .01*($dim[1]-$dim[0])*($dim[3]-$dim[2])) {
181 > } elsif ( $dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2]) ) {
182          print STDERR "Warning: Device far behind Z==0 plane\n";
183   }
184   # Assume Zmax==0 to derive thickness so pkgBSDF will work
185   $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
186                  ';h=' . ($dim[3] - $dim[2]) . '"';
187 < # Generate octree
188 < system "oconv -w $radscn > $octree";
189 < die "Could not compile scene\n" if ( $? );
190 < # Add MGF description if requested
191 < if ( $geout ) {
192 <        open(MGFSCN, "> $mgfscn");
193 <        printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
194 <        close MGFSCN;
172 <        if ( $mgfin ) {
173 <                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};
174 <        } else {
175 <                system "rad2mgf $radscn >> $mgfscn";
176 <        }
177 <        open(MGFSCN, ">> $mgfscn");
178 <        print MGFSCN "xf\n";
179 <        close MGFSCN;
180 <        $wrapper .= " -g $mgfscn";
181 < }
182 < # Create receiver & sender surfaces (rectangular)
187 > $wrapper .= " -g $mgfscn" if ( $geout );
188 > # Calculate CIE (u',v') from Radiance RGB:
189 > my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
190 >                'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
191 >                'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
192 >                'den=Xi+15*Yi+3*Zi;' .
193 >                'uprime=if(Yi,4*Xi/den,4/19);' .
194 >                'vprime=if(Yi,9*Yi/den,9/19);' ;
195   my $FEPS = 1e-5;
196 + my $ns = 2**$ttlog2;
197   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
198   my $ny = int($nsamp/$nx + 1);
199   $nsamp = $nx * $ny;
187 my $ns = 2**$ttlog2;
188 open(RADSCN, "> $receivers");
189 print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
190 print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
191 print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
192 print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
193 print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
194 print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
195 print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
196 print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
197 close RADSCN;
198 # Finish rfluxmtx command and prepare sender surfaces
200   $rfluxmtx .= " -n $nproc -c $nsamp";
201 < if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
202 <        open (RADSCN, "> $fsender");
203 <        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
204 <        print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
205 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
206 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
207 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
208 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
201 > if ( !defined $recovery ) {
202 >        open(MYAVH, "> $td/savedARGV.txt");
203 >        foreach (@savedARGV) {
204 >                print MYAVH "$_\n";
205 >        }
206 >        close MYAVH;
207 >        # Generate octree
208 >        system "oconv -w $radscn > $octree";
209 >        die "Could not compile scene\n" if ( $? );
210 >        # Add MGF description if requested
211 >        if ( $geout ) {
212 >                open(MGFSCN, "> $mgfscn");
213 >                printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
214 >                close MGFSCN;
215 >                if ( $mgfin ) {
216 >                        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};
217 >                } else {
218 >                        system "rad2mgf $radscn >> $mgfscn";
219 >                }
220 >                open(MGFSCN, ">> $mgfscn");
221 >                print MGFSCN "xf\n";
222 >                close MGFSCN;
223 >        }
224 >        # Create receiver & sender surfaces (rectangular)
225 >        open(RADSCN, "> $receivers");
226 >        print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
227 >        print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
228 >        print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
229 >        print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
230 >        print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
231 >        print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
232 >        print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
233 >        print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
234          close RADSCN;
235 <        open (RADSCN, "> $bsender");
236 <        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
237 <        print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
238 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
239 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
240 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
241 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
242 <        close RADSCN;
235 >        # Prepare sender surfaces
236 >        if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
237 >                open (RADSCN, "> $fsender");
238 >                print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
239 >                print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
240 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
241 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
242 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
243 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
244 >                close RADSCN;
245 >                open (RADSCN, "> $bsender");
246 >                print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
247 >                print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
248 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
249 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
250 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
251 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
252 >                close RADSCN;
253 >        }
254 >        print STDERR "Recover using: $0 -recover $td\n";
255   }
256 < # Calculate CIE (u',v') from Radiance RGB:
219 < my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
220 <                'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
221 <                'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
222 <                'den=Xi+15*Yi+3*Zi;' .
223 <                'uprime=4*Xi/den;vprime=9*Yi/den;' ;
256 > $curphase = 0;
257   # Create data segments (all the work happens here)
258   if ( $tensortree ) {
259          do_tree_bsdf();
# Line 234 | Line 267 | die "Could not wrap BSDF data\n" if ( $? );
267   # Clean up temporary files and exit
268   exec $rmtmp;
269  
270 < #-------------- End of main program segment --------------#
270 > #============== End of main program segment ==============#
271  
272 + # Function to determine if next phase should be skipped or recovered
273 + sub do_phase {
274 +        $curphase++;
275 +        if ( defined $recovery ) {
276 +                if ( $recovery > $curphase ) { return 0; }
277 +                if ( $recovery == $curphase ) { return -1; }
278 +        }
279 +        open(MYPH, ">> $td/phase.txt");
280 +        print MYPH "$curphase\n";
281 +        close MYPH;
282 +        return 1;
283 + }
284 +
285 + # Check if we are in active phase (not skipping parts)
286 + sub active_phase {
287 +        if ( defined $recovery ) {
288 +                if ( $recovery > $curphase ) { return 0; }
289 +                if ( $recovery == $curphase ) { return -1; }
290 +        }
291 +        return 1;
292 + }
293 +
294 + # Function to run program and check output if in active phase
295 + sub run_check {
296 +        if ( !active_phase() ) { return; }
297 +        my $cmd = shift;
298 +        # print STDERR "Running: $cmd\n";
299 +        system $cmd;
300 +        die "Failure running: $cmd\n" if ( $? );
301 + }
302 +
303   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
304   sub do_tree_bsdf {
305  
# Line 248 | Line 312 | sub do_tree_bsdf {
312   # Call rfluxmtx and process tensor tree BSDF for the given direction
313   sub do_ttree_dir {
314          my $forw = shift;
315 +        my $dop = do_phase();
316 +        my $r = ($dop < 0) ? " -r" : "";
317          my $cmd;
318          if ( $tensortree == 3 ) {
319                  # Isotropic BSDF
# Line 257 | Line 323 | sub do_ttree_dir {
323                                  qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
324                                  qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
325                                  qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
326 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
326 >                                qq{-e "r4=rand(-1.5839226*recno-59.82712)" } .
327 >                                qq{-e "odds(n):if(.5*n-floor(.5*n)-.25,-1,1)"} .
328 >                                qq{-e "Dx=1-(\$1+r1)/$ns2" } .
329 >                                qq{-e "Dy=min(1/$ns,sqrt(1-Dx*Dx))*odds(\$1)*r2" } .
330 >                                qq{-e "Dz=sqrt(1-Dx*Dx-Dy*Dy)" } .
331                                  qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
332                                  qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
333                                  qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
334                                  qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } .
335                                  qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } .
336 <                                "| $rfluxmtx -fa -y $ns2 - $receivers -i $octree";
336 >                                "| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
337                  } else {
338                          $cmd = "cnt $ns2 $ny $nx " .
339 <                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
340 <                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
341 <                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
342 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
343 <                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
344 <                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
345 <                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
339 >                                qq{| rcalc -e 'r1=rand(.8681*recno-.673892)' } .
340 >                                qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
341 >                                qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
342 >                                qq{-e 'r4=rand(-1.5839226*recno-59.82712)' } .
343 >                                qq{-e 'odds(n):if(.5*n-floor(.5*n)-.25,-1,1)' } .
344 >                                qq{-e 'Dx=1-(\$1+r1)/$ns2' } .
345 >                                qq{-e 'Dy=min(1/$ns,sqrt(1-Dx*Dx))*odds(\$1)*r2' } .
346 >                                qq{-e 'Dz=sqrt(1-Dx*Dx-Dy*Dy)' } .
347 >                                qq{-e 'xp=(\$3+r3)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
348 >                                qq{-e 'yp=(\$2+r4)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
349 >                                qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
350                                  qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
351                                  qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
352 <                                "| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree";
352 >                                "| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
353                  }
354          } else {
355                  # Anisotropic BSDF
356                  my $sender = ($bsender,$fsender)[$forw];
357                  if ($windoz) {
358 <                        $cmd = "$rfluxmtx -fa $sender $receivers -i $octree";
358 >                        $cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree";
359                  } else {
360 <                        $cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree";
360 >                        $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
361                  }
362          }
363 <        # print STDERR "Starting: $cmd\n";
364 <        system $cmd;
365 <        die "Failure running rfluxmtx" if ( $? );
363 >        if ( $dop ) {
364 >                # print STDERR "Running: $cmd\n";
365 >                system $cmd;
366 >                die "Failure running rfluxmtx" if ( $? );
367 >        }
368          ttree_out($forw);
369   }       # end of do_ttree_dir()
370  
# Line 360 | Line 436 | sub ttree_comp {
436                  }
437          }
438          if ($pctcull >= 0) {
439 <                my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
439 >                my $avg = ( $dorecip && ( $tensortree == 3 || "$typ" =~ /^r[fb]/ ) ) ? " -a" : "";
440                  my $pcull = ("$spec" eq "Visible") ? $pctcull :
441                                                       (100 - (100-$pctcull)*.25) ;
442                  if ($windoz) {
# Line 371 | Line 447 | sub ttree_comp {
447                          $cmd .= " -of $src " .
448                                          "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
449                  }
450 <                # print STDERR "Running: $cmd\n";
375 <                system "$cmd > $dest";
376 <                die "Failure running rttree_reduce" if ( $? );
450 >                run_check "$cmd > $dest";
451          } else {
452                  if ($windoz) {
453                          $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
454                  } else {
455                          $cmd .= " $src";
456                  }
457 <                open(DATOUT, "> $dest");
458 <                print DATOUT "{\n";
459 <                close DATOUT;
460 <                # print STDERR "Running: $cmd\n";
461 <                system "$cmd >> $dest";
462 <                die "Failure running rcalc" if ( $? );
463 <                open(DATOUT, ">> $dest");
464 <                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
465 <                        print DATOUT "0\n";
457 >                if ( active_phase() ) {
458 >                        open(DATOUT, "> $dest");
459 >                        print DATOUT "{\n";
460 >                        close DATOUT;
461 >                        # print STDERR "Running: $cmd\n";
462 >                        system "$cmd >> $dest";
463 >                        die "Failure running rcalc" if ( $? );
464 >                        open(DATOUT, ">> $dest");
465 >                        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
466 >                                print DATOUT "0\n";
467 >                        }
468 >                        print DATOUT "}\n";
469 >                        close DATOUT;
470                  }
393                print DATOUT "}\n";
394                close DATOUT;
471          }
472          if ( "$spec" ne "$curspec" ) {
473                  $wrapper .= " -s $spec";
# Line 414 | Line 490 | sub do_matrix_bsdf {
490   # Call rfluxmtx and process tensor tree BSDF for the given direction
491   sub do_matrix_dir {
492          my $forw = shift;
493 <        my $cmd;
493 >        my $dop = do_phase();
494 >        my $r = ($dop < 0) ? " -r" : "";
495          my $sender = ($bsender,$fsender)[$forw];
496 <        $cmd = "$rfluxmtx -fd $sender $receivers -i $octree";
497 <        # print STDERR "Starting: $cmd\n";
498 <        system $cmd;
499 <        die "Failure running rfluxmtx" if ( $? );
496 >        my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
497 >        if ( $dop ) {
498 >                # print STDERR "Running: $cmd\n";
499 >                system $cmd;
500 >                die "Failure running rfluxmtx" if ( $? );
501 >        }
502          matrix_out($forw);
503   }       # end of do_matrix_dir()
504  
# Line 463 | Line 542 | sub matrix_comp {
542          } elsif ("$spec" eq "CIE-Z") {
543                  $cmd .= " -c 0.0241 0.1229 0.8530";
544          }
545 <        $cmd .= " $src | rcollate -ho -oc 145";
546 <        # print STDERR "Running: $cmd\n";
468 <        system "$cmd > $dest";
469 <        die "Failure running rmtxop" if ( $? );
545 >        $cmd .= " $src | getinfo -";
546 >        run_check "$cmd > $dest";
547          if ( "$spec" ne "$curspec" ) {
548                  $wrapper .= " -s $spec";
549                  $curspec = $spec;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines