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.58 by greg, Fri May 29 07:22:33 2015 UTC vs.
Revision 2.95 by greg, Fri Apr 4 18:06:48 2025 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) {
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;
42 <        $rmtmp = "rmdir /S /Q $td";
60 >        $rmtmp = "rd /S /Q $td";
61   } else {
44        $td = mkdtemp("/tmp/genBSDF.XXXXXX");
45        chomp $td;
62          $radscn = "$td/device.rad";
63          $mgfscn = "$td/device.mgf";
64          $octree = "$td/device.oct";
# Line 66 | Line 82 | if ($windoz) {
82          $rmtmp = "rm -rf $td";
83   }
84   my @savedARGV = @ARGV;
85 < my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6";
85 > my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6 -w-";
86   my $wrapper = "wrapBSDF";
87   my $tensortree = 0;
88   my $ttlog2 = 4;
89 + my $dorecip = 1;
90   my $nsamp = 2000;
91   my $mgfin = 0;
92   my $geout = 1;
# Line 97 | Line 114 | while ($#ARGV >= 0) {
114                  shift @ARGV;
115          } elsif ("$ARGV[0]" =~ /^[-+]C/) {
116                  $docolor = ("$ARGV[0]" =~ /^\+/);
117 +        } elsif ("$ARGV[0]" =~ /^[-+]a/) {
118 +                $dorecip = ("$ARGV[0]" =~ /^\+/);
119          } elsif ("$ARGV[0]" =~ /^[-+]f/) {
120                  $doforw = ("$ARGV[0]" =~ /^\+/);
121          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
# Line 136 | Line 155 | while ($#ARGV >= 0) {
155   }
156   # Check that we're actually being asked to do something
157   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));
158   $wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c";
159   $wrapper .= " -u $gunit";
160 < # Get scene description and dimensions
161 < if ( $mgfin ) {
162 <        system "mgf2rad @ARGV > $radscn";
163 <        die "Could not load MGF input\n" if ( $? );
164 < } else {
149 <        system "xform -e @ARGV > $radscn";
150 <        die "Could not load Radiance input\n" if ( $? );
151 < }
152 < if ($#dim != 5) {
153 <        @dim = split ' ', `getbbox -h $radscn`;
154 < }
155 < print STDERR "Warning: Device extends into room\n" if ($dim[5] > 1e-5);
156 < $wrapper .= ' -f "t=' . ($dim[5] - $dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
157 <                ';h=' . ($dim[3] - $dim[2]) . '"';
158 < # Generate octree
159 < system "oconv -w $radscn > $octree";
160 < die "Could not compile scene\n" if ( $? );
161 < # Add MGF description if requested
162 < if ( $geout ) {
163 <        open(MGFSCN, "> $mgfscn");
164 <        printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
165 <        close MGFSCN;
160 > if ( !defined $recovery ) {
161 >        # Issue warning for unhandled reciprocity case
162 >        print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
163 >                        ($tensortree==3 && !($doforw && $doback));
164 >        # Get scene description
165          if ( $mgfin ) {
166 <                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};
166 >                system "mgf2rad -s @ARGV > $radscn";
167 >                die "Could not load MGF input\n" if ( $? );
168          } else {
169 <                system "rad2mgf $radscn >> $mgfscn";
169 >                system "xform -e @ARGV > $radscn";
170 >                die "Could not load Radiance input\n" if ( $? );
171          }
171        open(MGFSCN, ">> $mgfscn");
172        print MGFSCN "xf\n";
173        close MGFSCN;
174        $wrapper .= " -g $mgfscn";
172   }
173 < # Create receiver & sender surfaces (rectangular)
173 > if ( $#dim != 5 ) {
174 >        @dim = split ' ', `getbbox -h -w $radscn`;
175 > }
176 > die "Device entirely inside room!\n" if ( $dim[4] >= 0 );
177 > if ( $dim[5] > 1e-5 ) {
178 >        print STDERR "Warning: Device extends into room\n";
179 > } elsif ( $dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2]) ) {
180 >        print STDERR "Warning: Device far behind Z==0 plane\n";
181 > }
182 > # Assume Zmax==0 to derive thickness so pkgBSDF will work
183 > $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
184 >                ';h=' . ($dim[3] - $dim[2]) . '"';
185 > $wrapper .= " -g $mgfscn" if ( $geout );
186 > # Calculate CIE (u',v') from Radiance RGB:
187 > my $CIEuv =     'den=Xi+15*Yi+3*Zi;' .
188 >                'uprime=if(Yi,4*Xi/den,4/19);' .
189 >                'vprime=if(Yi,9*Yi/den,9/19);' ;
190   my $FEPS = 1e-5;
191 + my $ns = 2**$ttlog2;
192   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
193   my $ny = int($nsamp/$nx + 1);
194   $nsamp = $nx * $ny;
181 my $ns = 2**$ttlog2;
182 open(RADSCN, "> $receivers");
183 print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
184 print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
185 print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
186 print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
187 print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
188 print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
189 print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
190 print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
191 close RADSCN;
192 # Finish rfluxmtx command and prepare sender surfaces
195   $rfluxmtx .= " -n $nproc -c $nsamp";
196 < if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
197 <        open (RADSCN, "> $fsender");
198 <        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
199 <        print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
200 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
201 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
202 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
203 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
196 > if ( !defined $recovery ) {
197 >        open(MYAVH, "> $td/savedARGV.txt");
198 >        foreach (@savedARGV) {
199 >                print MYAVH "$_\n";
200 >        }
201 >        close MYAVH;
202 >        # Generate octree
203 >        system "oconv -w $radscn > $octree";
204 >        die "Could not compile scene\n" if ( $? );
205 >        # Add MGF description if requested
206 >        if ( $geout ) {
207 >                open(MGFSCN, "> $mgfscn");
208 >                printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
209 >                close MGFSCN;
210 >                if ( $mgfin ) {
211 >                        die "+mgf requires input file with +geom\n" if ($#ARGV < 0);
212 >                        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};
213 >                } else {
214 >                        system "rad2mgf $radscn >> $mgfscn";
215 >                }
216 >                open(MGFSCN, ">> $mgfscn");
217 >                print MGFSCN "xf\n";
218 >                close MGFSCN;
219 >        }
220 >        # Create receiver & sender surfaces (rectangular)
221 >        open(RADSCN, "> $receivers");
222 >        print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
223 >        print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
224 >        print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
225 >        print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
226 >        print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
227 >        print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
228 >        print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
229 >        print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
230          close RADSCN;
231 <        open (RADSCN, "> $bsender");
232 <        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
233 <        print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
234 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
235 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
236 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
237 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
238 <        close RADSCN;
231 >        # Prepare sender surfaces
232 >        if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
233 >                open (RADSCN, "> $fsender");
234 >                print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
235 >                print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
236 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
237 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
238 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
239 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
240 >                close RADSCN;
241 >                open (RADSCN, "> $bsender");
242 >                print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
243 >                print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
244 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
245 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
246 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
247 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
248 >                close RADSCN;
249 >        }
250 >        print STDERR "Recover using: $0 -recover $td\n";
251   }
252 < # Calculate CIE (u',v') from Radiance RGB:
213 < my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
214 <                'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
215 <                'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
216 <                'den=Xi+15*Yi+3*Zi;' .
217 <                'uprime=4*Xi/den;vprime=9*Yi/den;' ;
252 > $curphase = 0;
253   # Create data segments (all the work happens here)
254   if ( $tensortree ) {
255          do_tree_bsdf();
# Line 222 | Line 257 | if ( $tensortree ) {
257          do_matrix_bsdf();
258   }
259   # Output XML
225 my $old_fh = select(STDOUT);
226 $| = 1;
227 select($old_fh);
228 print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
229 print "<!-- Created by: genBSDF @savedARGV -->\n";
260   # print STDERR "Running: $wrapper\n";
261 < system $wrapper;
261 > system "$wrapper -C \"Created by: genBSDF @savedARGV\"";
262   die "Could not wrap BSDF data\n" if ( $? );
263   # Clean up temporary files and exit
264   exec $rmtmp;
265  
266 < #-------------- End of main program segment --------------#
266 > #============== End of main program segment ==============#
267  
268 + # Function to determine if next phase should be skipped or recovered
269 + sub do_phase {
270 +        $curphase++;
271 +        if ( defined $recovery ) {
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 +
281 + # Check if we are in active phase (not skipping parts)
282 + sub active_phase {
283 +        if ( defined $recovery ) {
284 +                if ( $recovery > $curphase ) { return 0; }
285 +                if ( $recovery == $curphase ) { return -1; }
286 +        }
287 +        return 1;
288 + }
289 +
290 + # Function to run program and check output if in active phase
291 + sub run_check {
292 +        if ( !active_phase() ) { return; }
293 +        my $cmd = shift;
294 +        # print STDERR "Running: $cmd\n";
295 +        system $cmd;
296 +        die "Failure running: $cmd\n" if ( $? );
297 + }
298 +
299   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
300   sub do_tree_bsdf {
301  
# Line 247 | Line 308 | sub do_tree_bsdf {
308   # Call rfluxmtx and process tensor tree BSDF for the given direction
309   sub do_ttree_dir {
310          my $forw = shift;
311 +        my $dop = do_phase();
312 +        my $r = ($dop < 0) ? " -r" : "";
313          my $cmd;
314          if ( $tensortree == 3 ) {
315                  # Isotropic BSDF
# Line 256 | Line 319 | sub do_ttree_dir {
319                                  qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
320                                  qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
321                                  qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
322 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
322 >                                qq{-e "r4=rand(-1.5839226*recno-59.82712)" } .
323 >                                qq{-e "odds(n):if(.5*n-floor(.5*n)-.25,-1,1)"} .
324 >                                qq{-e "Dx=1-(\$1+r1)/$ns2" } .
325 >                                qq{-e "Dy=min(1/$ns,sqrt(1-Dx*Dx))*odds(\$1)*r2" } .
326 >                                qq{-e "Dz=sqrt(1-Dx*Dx-Dy*Dy)" } .
327                                  qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
328                                  qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
329                                  qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
330                                  qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } .
331                                  qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } .
332 <                                "| $rfluxmtx -fa -y $ns2 - $receivers -i $octree";
332 >                                "| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
333                  } else {
334                          $cmd = "cnt $ns2 $ny $nx " .
335 <                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
336 <                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
337 <                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
338 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
339 <                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
340 <                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
341 <                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
335 >                                qq{| rcalc -e 'r1=rand(.8681*recno-.673892)' } .
336 >                                qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
337 >                                qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
338 >                                qq{-e 'r4=rand(-1.5839226*recno-59.82712)' } .
339 >                                qq{-e 'odds(n):if(.5*n-floor(.5*n)-.25,-1,1)' } .
340 >                                qq{-e 'Dx=1-(\$1+r1)/$ns2' } .
341 >                                qq{-e 'Dy=min(1/$ns,sqrt(1-Dx*Dx))*odds(\$1)*r2' } .
342 >                                qq{-e 'Dz=sqrt(1-Dx*Dx-Dy*Dy)' } .
343 >                                qq{-e 'xp=(\$3+r3)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
344 >                                qq{-e 'yp=(\$2+r4)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
345 >                                qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
346                                  qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
347                                  qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
348 <                                "| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree";
348 >                                "| $rfluxmtx$r -ff -y $ns2 - $receivers -i $octree";
349                  }
350          } else {
351                  # Anisotropic BSDF
352                  my $sender = ($bsender,$fsender)[$forw];
353                  if ($windoz) {
354 <                        $cmd = "$rfluxmtx -fa $sender $receivers -i $octree";
354 >                        $cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree";
355                  } else {
356 <                        $cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree";
356 >                        $cmd = "$rfluxmtx$r -ff $sender $receivers -i $octree";
357                  }
358          }
359 <        # print STDERR "Starting: $cmd\n";
360 <        system $cmd;
361 <        die "Failure running rfluxmtx" if ( $? );
359 >        if ( $dop ) {
360 >                # print STDERR "Running: $cmd\n";
361 >                system $cmd;
362 >                die "Failure running rfluxmtx" if ( $? );
363 >        }
364          ttree_out($forw);
365   }       # end of do_ttree_dir()
366  
# Line 328 | Line 401 | sub ttree_comp {
401          my $dest = shift;
402          my $cmd;
403          if ($windoz) {
404 +                $cmd = "rcomb -fa -c xyz $src | rcollate -ho -oc 1" .
405 +                                q{ | rcalc -e "Xi=$1;Yi=$2;Zi=$3" };
406                  if ("$spec" eq "Visible") {
407 <                        $cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } .
333 <                                q{-e "Ri=$1;Gi=$2;Bi=$3" } .
334 <                                qq{-e "$CIEuv" } .
407 >                        $cmd .= qq{-e "Omega:PI/($ns*$ns)" } .
408                                  q{-e "$1=Yi/Omega"};
409                  } elsif ("$spec" eq "CIE-u") {
410 <                        $cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
338 <                                qq{-e "$CIEuv" } .
410 >                        $cmd .= qq{-e "$CIEuv" } .
411                                  q{-e "$1=uprime"};
412                  } elsif ("$spec" eq "CIE-v") {
413 <                        $cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
342 <                                qq{-e "$CIEuv" } .
413 >                        $cmd .= qq{-e "$CIEuv" } .
414                                  q{-e "$1=vprime"};
415                  }
416          } else {
417 +                $cmd = "rcomb -ff -c xyz $src | getinfo -" .
418 +                                q{ | rcalc -if3 -of -e 'Xi=$1;Yi=$2;Zi=$3' };
419                  if ("$spec" eq "Visible") {
420 <                        $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
348 <                                q{-e 'Ri=$1;Gi=$2;Bi=$3' } .
349 <                                "-e '$CIEuv' " .
420 >                        $cmd .= "-e 'Omega:PI/($ns*$ns)' " .
421                                  q{-e '$1=Yi/Omega'};
422                  } elsif ("$spec" eq "CIE-u") {
423 <                        $cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
353 <                                "-e '$CIEuv' " .
423 >                        $cmd .= "-e '$CIEuv' " .
424                                  q{-e '$1=uprime'};
425                  } elsif ("$spec" eq "CIE-v") {
426 <                        $cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
357 <                                "-e '$CIEuv' " .
426 >                        $cmd .= "-e '$CIEuv' " .
427                                  q{-e '$1=vprime'};
428                  }
429          }
430          if ($pctcull >= 0) {
431 <                my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
431 >                my $avg = ( $dorecip && ( $tensortree == 3 || "$typ" =~ /^r[fb]/ ) ) ? " -a" : "";
432                  my $pcull = ("$spec" eq "Visible") ? $pctcull :
433                                                       (100 - (100-$pctcull)*.25) ;
434                  if ($windoz) {
435 <                        $cmd = "rcollate -ho -oc 1 $src | " .
367 <                                        $cmd .
368 <                                        " | rttree_reduce$avg -h -fa -t $pcull -r $tensortree -g $ttlog2";
435 >                        $cmd .= " | rttree_reduce$avg -h -fa -t $pcull -r $tensortree -g $ttlog2";
436                  } else {
437 <                        $cmd .= " -of $src " .
371 <                                        "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
437 >                        $cmd .= " | rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
438                  }
439 <                # print STDERR "Running: $cmd\n";
374 <                system "$cmd > $dest";
375 <                die "Failure running rttree_reduce" if ( $? );
439 >                run_check "$cmd > $dest";
440          } else {
441 <                if ($windoz) {
442 <                        $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
443 <                } else {
444 <                        $cmd .= " $src";
441 >                if ( active_phase() ) {
442 >                        open(DATOUT, "> $dest");
443 >                        print DATOUT "{\n";
444 >                        close DATOUT;
445 >                        # print STDERR "Running: $cmd\n";
446 >                        system "$cmd >> $dest";
447 >                        die "Failure running rcalc" if ( $? );
448 >                        open(DATOUT, ">> $dest");
449 >                        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
450 >                                print DATOUT "0\n";
451 >                        }
452 >                        print DATOUT "}\n";
453 >                        close DATOUT;
454                  }
382                open(DATOUT, "> $dest");
383                print DATOUT "{\n";
384                close DATOUT;
385                # print STDERR "Running: $cmd\n";
386                system "$cmd >> $dest";
387                die "Failure running rcalc" if ( $? );
388                open(DATOUT, ">> $dest");
389                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
390                        print DATOUT "0\n";
391                }
392                print DATOUT "}\n";
393                close DATOUT;
455          }
456          if ( "$spec" ne "$curspec" ) {
457                  $wrapper .= " -s $spec";
# Line 413 | Line 474 | sub do_matrix_bsdf {
474   # Call rfluxmtx and process tensor tree BSDF for the given direction
475   sub do_matrix_dir {
476          my $forw = shift;
477 <        my $cmd;
477 >        my $dop = do_phase();
478 >        my $r = ($dop < 0) ? " -r" : "";
479          my $sender = ($bsender,$fsender)[$forw];
480 <        $cmd = "$rfluxmtx -fd $sender $receivers -i $octree";
481 <        # print STDERR "Starting: $cmd\n";
482 <        system $cmd;
483 <        die "Failure running rfluxmtx" if ( $? );
480 >        my $cmd = "$rfluxmtx$r -ff $sender $receivers -i $octree";
481 >        if ( $dop ) {
482 >                # print STDERR "Running: $cmd\n";
483 >                system $cmd;
484 >                die "Failure running rfluxmtx" if ( $? );
485 >        }
486          matrix_out($forw);
487   }       # end of do_matrix_dir()
488  
# Line 456 | Line 520 | sub matrix_comp {
520          my $dest = shift;
521          my $cmd = "rmtxop -fa -t";
522          if ("$spec" eq "Visible") {
523 <                $cmd .= " -c 0.2651 0.6701 0.0648";
523 >                $cmd .= " -c y";
524          } elsif ("$spec" eq "CIE-X") {
525 <                $cmd .= " -c 0.5141 0.3239 0.1620";
525 >                $cmd .= " -c x";
526          } elsif ("$spec" eq "CIE-Z") {
527 <                $cmd .= " -c 0.0241 0.1229 0.8530";
527 >                $cmd .= " -c z";
528          }
529 <        $cmd .= " $src | rcollate -ho -oc 145";
530 <        # print STDERR "Running: $cmd\n";
467 <        system "$cmd > $dest";
468 <        die "Failure running rttree_reduce" if ( $? );
529 >        $cmd .= " $src | getinfo -";
530 >        run_check "$cmd > $dest";
531          if ( "$spec" ne "$curspec" ) {
532                  $wrapper .= " -s $spec";
533                  $curspec = $spec;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines