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.43 by greg, Mon Aug 5 22:56:50 2013 UTC vs.
Revision 2.57 by greg, Thu Apr 2 17:42:46 2015 UTC

# Line 6 | Line 6
6   #       G. Ward
7   #
8   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][-t{3|4} Nlog2][-r \"ropts\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}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][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
13          exit 1;
14   }
15 < my $td = mkdtemp("/tmp/genBSDF.XXXXXX");
16 < chomp $td;
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) {
18 >        my $tmploc = `echo \%TMP\%`;
19 >        chomp($tmploc);
20 >        $td = mkdtemp("$tmploc\\genBSDF.XXXXXX");
21 >        $radscn = "$td\\device.rad";
22 >        $mgfscn = "$td\\device.mgf";
23 >        $octree = "$td\\device.oct";
24 >        $fsender = "$td\\fsender.rad";
25 >        $bsender = "$td\\bsender.rad";
26 >        $receivers = "$td\\receivers.rad";
27 >        $facedat = "$td\\face.dat";
28 >        $behinddat = "$td\\behind.dat";
29 >        $tf = "$td\\tf.dat";
30 >        $rf = "$td\\rf.dat";
31 >        $tb = "$td\\tb.dat";
32 >        $rb = "$td\\rb.dat";
33 >        $tfx = "$td\\tfx.dat";
34 >        $rfx = "$td\\rfx.dat";
35 >        $tbx = "$td\\tbx.dat";
36 >        $rbx = "$td\\rbx.dat";
37 >        $tfz = "$td\\tfz.dat";
38 >        $rfz = "$td\\rfz.dat";
39 >        $tbz = "$td\\tbz.dat";
40 >        $rbz = "$td\\rbz.dat";
41 >        chomp $td;
42 >        $rmtmp = "rmdir /S /Q $td";
43 > } else {
44 >        $td = mkdtemp("/tmp/genBSDF.XXXXXX");
45 >        chomp $td;
46 >        $radscn = "$td/device.rad";
47 >        $mgfscn = "$td/device.mgf";
48 >        $octree = "$td/device.oct";
49 >        $fsender = "$td/fsender.rad";
50 >        $bsender = "$td/bsender.rad";
51 >        $receivers = "$td/receivers.rad";
52 >        $facedat = "$td/face.dat";
53 >        $behinddat = "$td/behind.dat";
54 >        $tf = "$td/tf.dat";
55 >        $rf = "$td/rf.dat";
56 >        $tb = "$td/tb.dat";
57 >        $rb = "$td/rb.dat";
58 >        $tfx = "$td/tfx.dat";
59 >        $rfx = "$td/rfx.dat";
60 >        $tbx = "$td/tbx.dat";
61 >        $rbx = "$td/rbx.dat";
62 >        $tfz = "$td/tfz.dat";
63 >        $rfz = "$td/rfz.dat";
64 >        $tbz = "$td/tbz.dat";
65 >        $rbz = "$td/rbz.dat";
66 >        $rmtmp = "rm -rf $td";
67 > }
68   my @savedARGV = @ARGV;
69 + my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6";
70 + my $wrapper = "wrapBSDF";
71   my $tensortree = 0;
72   my $ttlog2 = 4;
73   my $nsamp = 2000;
20 – my $rtargs = "-w -ab 5 -ad 700 -lw 3e-6";
74   my $mgfin = 0;
75   my $geout = 1;
76   my $nproc = 1;
77 + my $docolor = 0;
78   my $doforw = 0;
79   my $doback = 1;
80   my $pctcull = 90;
81   my $gunit = "meter";
82 + my $curspec = "Visible";
83   my @dim;
84   # Get options
85   while ($#ARGV >= 0) {
86          if ("$ARGV[0]" =~ /^[-+]m/) {
87                  $mgfin = ("$ARGV[0]" =~ /^\+/);
88          } elsif ("$ARGV[0]" eq "-r") {
89 <                $rtargs = "$rtargs $ARGV[1]";
89 >                $rfluxmtx .= " $ARGV[1]";
90                  shift @ARGV;
91          } elsif ("$ARGV[0]" =~ /^[-+]g/) {
92                  $geout = ("$ARGV[0]" =~ /^\+/);
# Line 40 | Line 95 | while ($#ARGV >= 0) {
95                          die "Illegal geometry unit '$gunit': must be meter, foot, inch, centimeter, or millimeter\n";
96                  }
97                  shift @ARGV;
98 +        } elsif ("$ARGV[0]" =~ /^[-+]C/) {
99 +                $docolor = ("$ARGV[0]" =~ /^\+/);
100          } elsif ("$ARGV[0]" =~ /^[-+]f/) {
101                  $doforw = ("$ARGV[0]" =~ /^\+/);
102          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
# Line 47 | Line 104 | while ($#ARGV >= 0) {
104          } elsif ("$ARGV[0]" eq "-t") {
105                  # Use value < 0 for rttree_reduce bypass
106                  $pctcull = $ARGV[1];
107 +                if ($pctcull >= 100) {
108 +                        die "Illegal -t culling percentage, must be < 100\n";
109 +                }
110                  shift @ARGV;
111          } elsif ("$ARGV[0]" =~ /^-t[34]$/) {
112                  $tensortree = substr($ARGV[0], 2, 1);
113                  $ttlog2 = $ARGV[1];
114                  shift @ARGV;
115 +        } elsif ("$ARGV[0]" eq "-s") {
116 +                $wrapper .= " -f \"$ARGV[1]\"";
117 +                shift @ARGV;
118 +        } elsif ("$ARGV[0]" eq "-W") {
119 +                $wrapper .= " -W";
120          } elsif ("$ARGV[0]" eq "-c") {
121                  $nsamp = $ARGV[1];
122                  shift @ARGV;
# Line 71 | Line 136 | while ($#ARGV >= 0) {
136   }
137   # Check that we're actually being asked to do something
138   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));
142 + $wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c";
143 + $wrapper .= " -u $gunit";
144   # Get scene description and dimensions
75 – my $radscn = "$td/device.rad";
76 – my $mgfscn = "$td/device.mgf";
77 – my $octree = "$td/device.oct";
145   if ( $mgfin ) {
146 <        system "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";
146 >        system "mgf2rad @ARGV > $radscn";
147          die "Could not load MGF input\n" if ( $? );
81 –        system "mgf2rad $mgfscn > $radscn";
148   } else {
149          system "xform -e @ARGV > $radscn";
150          die "Could not load Radiance input\n" if ( $? );
85 –        system "rad2mgf $radscn > $mgfscn" if ( $geout );
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 < # Add receiver surfaces (rectangular)
157 < my $fmodnm="receiver_face";
93 < my $bmodnm="receiver_behind";
94 < open(RADSCN, ">> $radscn");
95 < print RADSCN "void glow $fmodnm\n0\n0\n4 1 1 1 0\n\n";
96 < print RADSCN "$fmodnm source f_receiver\n0\n0\n4 0 0 1 180\n";
97 < print RADSCN "void glow $bmodnm\n0\n0\n4 1 1 1 0\n\n";
98 < print RADSCN "$bmodnm source b_receiver\n0\n0\n4 0 0 -1 180\n";
99 < close RADSCN;
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 < # Output XML prologue
104 < print
105 < '<?xml version="1.0" encoding="UTF-8"?>
106 < <WindowElement xmlns="http://windows.lbl.gov" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windows.lbl.gov/BSDF-v1.4.xsd">
107 < ';
108 < print "<!-- File produced by: genBSDF @savedARGV -->\n";
109 < print
110 < '<WindowElementType>System</WindowElementType>
111 < <FileType>BSDF</FileType>
112 < <Optical>
113 < <Layer>
114 <        <Material>
115 <                <Name>Name</Name>
116 <                <Manufacturer>Manufacturer</Manufacturer>
117 < ';
118 < printf "\t\t<Thickness unit=\"$gunit\">%.3f</Thickness>\n", $dim[5] - $dim[4];
119 < printf "\t\t<Width unit=\"$gunit\">%.3f</Width>\n", $dim[1] - $dim[0];
120 < printf "\t\t<Height unit=\"$gunit\">%.3f</Height>\n", $dim[3] - $dim[2];
121 < print "\t\t<DeviceType>Other</DeviceType>\n";
122 < print " </Material>\n";
123 < # Output MGF description if requested
161 > # Add MGF description if requested
162   if ( $geout ) {
163 <        print "\t<Geometry format=\"MGF\">\n";
164 <        print "\t\t<MGFblock unit=\"$gunit\">\n";
127 <        printf "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
128 <        open(MGFSCN, "< $mgfscn");
129 <        while (<MGFSCN>) { print $_; }
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;
166 <        print "xf\n";
167 <        print "</MGFblock>\n";
168 <        print "\t</Geometry>\n";
166 >        if ( $mgfin ) {
167 >                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};
168 >        } else {
169 >                system "rad2mgf $radscn >> $mgfscn";
170 >        }
171 >        open(MGFSCN, ">> $mgfscn");
172 >        print MGFSCN "xf\n";
173 >        close MGFSCN;
174 >        $wrapper .= " -g $mgfscn";
175   }
176 < # Set up surface sampling
177 < my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + .5);
178 < my $ny = int($nsamp/$nx + .5);
176 > # Create receiver & sender surfaces (rectangular)
177 > my $FEPS = 1e-5;
178 > my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
179 > my $ny = int($nsamp/$nx + 1);
180   $nsamp = $nx * $ny;
181   my $ns = 2**$ttlog2;
182 < my (@pdiv, $disk2sq, $sq2disk, $tcal, $kcal);
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
193 > $rfluxmtx .= " -n $nproc -c $nsamp";
194 > if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
195 >        open (RADSCN, "> $fsender");
196 >        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
197 >        print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
198 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
199 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
200 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
201 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
202 >        close RADSCN;
203 >        open (RADSCN, "> $bsender");
204 >        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
205 >        print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
206 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
207 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
208 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
209 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
210 >        close RADSCN;
211 > }
212 > # 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;' ;
218   # Create data segments (all the work happens here)
219   if ( $tensortree ) {
220          do_tree_bsdf();
221   } else {
222          do_matrix_bsdf();
223   }
224 < # Output XML epilogue
225 < print
226 < '</Layer>
227 < </Optical>
228 < </WindowElement>
229 < ';
224 > # Output XML
225 > my $old_fh = select(STDOUT);
226 > $| = 1;
227 > select($old_fh);
228 > print "<!-- Created by: genBSDF @savedARGV -->\n";
229 > # print STDERR "Running: $wrapper\n";
230 > system $wrapper;
231 > die "Could not wrap BSDF data\n" if ( $? );
232   # Clean up temporary files and exit
233 < exec("rm -rf $td");
233 > exec $rmtmp;
234  
235   #-------------- End of main program segment --------------#
236  
237   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
238   sub do_tree_bsdf {
160 – # Shirley-Chiu mapping from unit square to disk
161 – $sq2disk = '
162 – in_square_a = 2*in_square_x - 1;
163 – in_square_b = 2*in_square_y - 1;
164 – in_square_rgn = if(in_square_a + in_square_b,
165 –                        if(in_square_a - in_square_b, 1, 2),
166 –                        if(in_square_b - in_square_a, 3, 4));
167 – out_disk_r = .999995*select(in_square_rgn, in_square_a, in_square_b,
168 –                        -in_square_a, -in_square_b);
169 – out_disk_phi = PI/4 * select(in_square_rgn,
170 –                                in_square_b/in_square_a,
171 –                                2 - in_square_a/in_square_b,
172 –                                4 + in_square_b/in_square_a,
173 –                                if(in_square_b*in_square_b,
174 –                                        6 - in_square_a/in_square_b, 0));
175 – Dx = out_disk_r*cos(out_disk_phi);
176 – Dy = out_disk_r*sin(out_disk_phi);
177 – Dz = sqrt(1 - out_disk_r*out_disk_r);
178 – ';
179 – # Shirley-Chiu mapping from unit disk to square
180 – $disk2sq = '
181 – norm_radians(p) : if(-p - PI/4, p + 2*PI, p);
182 – in_disk_r = .999995*sqrt(Dx*Dx + Dy*Dy);
183 – in_disk_phi = norm_radians(atan2(Dy, Dx));
184 – in_disk_rgn = floor((in_disk_phi + PI/4)/(PI/2)) + 1;
185 – out_square_a = select(in_disk_rgn,
186 –                        in_disk_r,
187 –                        (PI/2 - in_disk_phi)*in_disk_r/(PI/4),
188 –                        -in_disk_r,
189 –                        (in_disk_phi - 3*PI/2)*in_disk_r/(PI/4));
190 – out_square_b = select(in_disk_rgn,
191 –                        in_disk_phi*in_disk_r/(PI/4),
192 –                        in_disk_r,
193 –                        (PI - in_disk_phi)*in_disk_r/(PI/4),
194 –                        -in_disk_r);
195 – out_square_x = (out_square_a + 1)/2;
196 – out_square_y = (out_square_b + 1)/2;
197 – ';
198 – # Announce ourselves in XML output
199 – print "\t<DataDefinition>\n";
200 – print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
201 – print "\t</DataDefinition>\n";
239  
240 < # Start rcontrib processes for compute each side
241 < do_tree_rtcontrib(0) if ( $doback );
242 < do_tree_rtcontrib(1) if ( $doforw );
240 >        # Run rfluxmtx processes to compute each side
241 >        do_ttree_dir(0) if ( $doback );
242 >        do_ttree_dir(1) if ( $doforw );
243  
244   }       # end of sub do_tree_bsdf()
245  
246 < # Run rcontrib process to generate tensor tree samples
247 < sub do_tree_rtcontrib {
246 > # Call rfluxmtx and process tensor tree BSDF for the given direction
247 > sub do_ttree_dir {
248          my $forw = shift;
249 <        my $matargs = "-m $bmodnm";
213 <        if ( !$forw || !$doback || $tensortree==3 ) { $matargs .= " -m $fmodnm"; }
214 <        my $cmd = "rcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
215 <                "-e '$disk2sq' -bn '$ns*$ns' " .
216 <                "-b '$ns*floor(out_square_x*$ns)+floor(out_square_y*$ns)' " .
217 <                "-o $td/%s.flt $matargs $octree";
249 >        my $cmd;
250          if ( $tensortree == 3 ) {
251                  # Isotropic BSDF
252                  my $ns2 = $ns / 2;
253 <                $cmd = "cnt $ns2 $ny $nx " .
254 <                        "| rcalc -e 'r1=rand(.8681*recno-.673892)' " .
255 <                        "-e 'r2=rand(-5.37138*recno+67.1737811)' " .
256 <                        "-e 'r3=rand(+3.17603772*recno+83.766771)' " .
257 <                        "-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
258 <                        "-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
259 <                        "-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
260 <                        "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
261 <                        "-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' " .
262 <                        "-e '\$4=Dx;\$5=Dy;\$6=myDz' -of " .
263 <                        "| $cmd";
253 >                if ($windoz) {
254 >                        $cmd = "cnt $ns2 $ny $nx " .
255 >                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
256 >                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
257 >                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
258 >                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
259 >                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
260 >                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
261 >                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
262 >                                qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } .
263 >                                qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } .
264 >                                "| $rfluxmtx -fa -y $ns2 - $receivers -i $octree";
265 >                } else {
266 >                        $cmd = "cnt $ns2 $ny $nx " .
267 >                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
268 >                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
269 >                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
270 >                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
271 >                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
272 >                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
273 >                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
274 >                                qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
275 >                                qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
276 >                                "| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree";
277 >                }
278          } else {
279                  # Anisotropic BSDF
280 <                # Sample area vertically to improve load balance, since
281 <                # shading systems usually have bilateral symmetry (L-R)
282 <                $cmd = "cnt $ns $ns $ny $nx " .
283 <                        "| rcalc -e 'r1=rand(.8681*recno-.673892)' " .
284 <                        "-e 'r2=rand(-5.37138*recno+67.1737811)' " .
285 <                        "-e 'r3=rand(3.17603772*recno+83.766771)' " .
240 <                        "-e 'r4=rand(-2.3857833*recno-964.72738)' " .
241 <                        "-e 'in_square_x=(\$1+r1)/$ns' " .
242 <                        "-e 'in_square_y=(\$2+r2)/$ns' -e '$sq2disk' " .
243 <                        "-e 'xp=(\$4+r3)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
244 <                        "-e 'yp=(\$3+r4)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
245 <                        "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
246 <                        "-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' " .
247 <                        "-e '\$4=Dx;\$5=Dy;\$6=myDz' -of " .
248 <                        "| $cmd";
280 >                my $sender = ($bsender,$fsender)[$forw];
281 >                if ($windoz) {
282 >                        $cmd = "$rfluxmtx -fa $sender $receivers -i $octree";
283 >                } else {
284 >                        $cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree";
285 >                }
286          }
287 < # print STDERR "Starting: $cmd\n";
288 <        system "$cmd" || die "Failure running rcontrib";
287 >        # print STDERR "Starting: $cmd\n";
288 >        system $cmd;
289 >        die "Failure running rfluxmtx" if ( $? );
290          ttree_out($forw);
291 < }       # end of do_tree_rtcontrib()
291 > }       # end of do_ttree_dir()
292  
293 < # Simplify and output tensor tree results
293 > # Simplify and store tensor tree results
294   sub ttree_out {
295          my $forw = shift;
296 <        my $side = ("Back","Front")[$forw];
297 <        my $cmd;
298 < # Only output one transmitted anisotropic distribution, preferring backwards
299 < if ( !$forw || !$doback || $tensortree==3 ) {
300 < print
301 < '       <WavelengthData>
302 <                <LayerNumber>System</LayerNumber>
265 <                <Wavelength unit="Integral">Visible</Wavelength>
266 <                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
267 <                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
268 <                <WavelengthDataBlock>
269 < ';
270 < print "\t\t\t<WavelengthDataDirection>Transmission $side</WavelengthDataDirection>\n";
271 < print
272 < '                       <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
273 <                        <ScatteringDataType>BTDF</ScatteringDataType>
274 <                        <ScatteringData>
275 < ';
276 < $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
277 <        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
278 < if ($pctcull >= 0) {
279 <        $cmd .= "-of $td/" . ($bmodnm,$fmodnm)[$forw] . ".flt " .
280 <        "| rttree_reduce -h -ff -t $pctcull -r $tensortree -g $ttlog2";
281 <        system "$cmd" || die "Failure running rttree_reduce";
282 < } else {
283 <        $cmd .= "$td/" . ($bmodnm,$fmodnm)[$forw] . ".flt";
284 <        print "{\n";
285 <        system "$cmd" || die "Failure running rcalc";
286 <        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
287 <                print "0\n";
296 >        my ($refldat,$transdat);
297 >        if ( $forw ) {
298 >                $transdat = $facedat;
299 >                $refldat = $behinddat;
300 >        } else {
301 >                $transdat = $behinddat;
302 >                $refldat = $facedat;
303          }
304 <        print "}\n";
305 < }
306 < print
307 < '                       </ScatteringData>
308 <                </WavelengthDataBlock>
309 <        </WavelengthData>
310 < ';
311 < }
297 < # Output reflection
298 < print
299 < '       <WavelengthData>
300 <                <LayerNumber>System</LayerNumber>
301 <                <Wavelength unit="Integral">Visible</Wavelength>
302 <                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
303 <                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
304 <                <WavelengthDataBlock>
305 < ';
306 < print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
307 < print
308 < '                       <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
309 <                        <ScatteringDataType>BTDF</ScatteringDataType>
310 <                        <ScatteringData>
311 < ';
312 < $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
313 <        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
314 < if ($pctcull >= 0) {
315 <        $cmd .= "-of $td/" . ($fmodnm,$bmodnm)[$forw] . ".flt " .
316 <        "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
317 <        system "$cmd" || die "Failure running rttree_reduce";
318 < } else {
319 <        $cmd .= "$td/" . ($fmodnm,$bmodnm)[$forw] . ".flt";
320 <        print "{\n";
321 <        system "$cmd" || die "Failure running rcalc";
322 <        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
323 <                print "0\n";
304 >        # Only output one transmitted anisotropic distribution, preferring backwards
305 >        if ( !$forw || !$doback || $tensortree==3 ) {
306 >                my $ttyp = ("tb","tf")[$forw];
307 >                ttree_comp($ttyp, "Visible", $transdat, ($tb,$tf)[$forw]);
308 >                if ( $docolor ) {
309 >                        ttree_comp($ttyp, "CIE-u", $transdat, ($tbx,$tfx)[$forw]);
310 >                        ttree_comp($ttyp, "CIE-v", $transdat, ($tbz,$tfz)[$forw]);
311 >                }
312          }
313 <        print "}\n";
314 < }
315 < print
316 < '                       </ScatteringData>
317 <                </WavelengthDataBlock>
318 <        </WavelengthData>
319 < ';
313 >        # Output reflection
314 >        my $rtyp = ("rb","rf")[$forw];
315 >        ttree_comp($rtyp, "Visible", $refldat, ($rb,$rf)[$forw]);
316 >        if ( $docolor ) {
317 >                ttree_comp($rtyp, "CIE-u", $refldat, ($rbx,$rfx)[$forw]);
318 >                ttree_comp($rtyp, "CIE-v", $refldat, ($rbz,$rfz)[$forw]);
319 >        }
320   }       # end of ttree_out()
321  
322 + # Call rttree_reduce on the given component
323 + sub ttree_comp {
324 +        my $typ = shift;
325 +        my $spec = shift;
326 +        my $src = shift;
327 +        my $dest = shift;
328 +        my $cmd;
329 +        if ($windoz) {
330 +                if ("$spec" eq "Visible") {
331 +                        $cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } .
332 +                                q{-e "Ri=$1;Gi=$2;Bi=$3" } .
333 +                                qq{-e "$CIEuv" } .
334 +                                q{-e "$1=Yi/Omega"};
335 +                } elsif ("$spec" eq "CIE-u") {
336 +                        $cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
337 +                                qq{-e "$CIEuv" } .
338 +                                q{-e "$1=uprime"};
339 +                } elsif ("$spec" eq "CIE-v") {
340 +                        $cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
341 +                                qq{-e "$CIEuv" } .
342 +                                q{-e "$1=vprime"};
343 +                }
344 +        } else {
345 +                if ("$spec" eq "Visible") {
346 +                        $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
347 +                                q{-e 'Ri=$1;Gi=$2;Bi=$3' } .
348 +                                "-e '$CIEuv' " .
349 +                                q{-e '$1=Yi/Omega'};
350 +                } elsif ("$spec" eq "CIE-u") {
351 +                        $cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
352 +                                "-e '$CIEuv' " .
353 +                                q{-e '$1=uprime'};
354 +                } elsif ("$spec" eq "CIE-v") {
355 +                        $cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
356 +                                "-e '$CIEuv' " .
357 +                                q{-e '$1=vprime'};
358 +                }
359 +        }
360 +        if ($pctcull >= 0) {
361 +                my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
362 +                my $pcull = ("$spec" eq "Visible") ? $pctcull :
363 +                                                     (100 - (100-$pctcull)*.25) ;
364 +                if ($windoz) {
365 +                        $cmd = "rcollate -ho -oc 1 $src | " .
366 +                                        $cmd .
367 +                                        " | rttree_reduce$avg -h -fa -t $pcull -r $tensortree -g $ttlog2";
368 +                } else {
369 +                        $cmd .= " -of $src " .
370 +                                        "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
371 +                }
372 +                # print STDERR "Running: $cmd\n";
373 +                system "$cmd > $dest";
374 +                die "Failure running rttree_reduce" if ( $? );
375 +        } else {
376 +                if ($windoz) {
377 +                        $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
378 +                } else {
379 +                        $cmd .= " $src";
380 +                }
381 +                open(DATOUT, "> $dest");
382 +                print DATOUT "{\n";
383 +                close DATOUT;
384 +                # print STDERR "Running: $cmd\n";
385 +                system "$cmd >> $dest";
386 +                die "Failure running rcalc" if ( $? );
387 +                open(DATOUT, ">> $dest");
388 +                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
389 +                        print DATOUT "0\n";
390 +                }
391 +                print DATOUT "}\n";
392 +                close DATOUT;
393 +        }
394 +        if ( "$spec" ne "$curspec" ) {
395 +                $wrapper .= " -s $spec";
396 +                $curspec = $spec;
397 +        }
398 +        $wrapper .= " -$typ $dest";
399 + }       # end of ttree_comp()
400 +
401   #------------- End of do_tree_bsdf() & subroutines -------------#
402  
403   #+++++++++++++++ Klems matrix BSDF generation +++++++++++++++#
404   sub do_matrix_bsdf {
405 < # Set up sampling of portal
406 < # Kbin to produce incident direction in full Klems basis with (x1,x2) randoms
407 < $tcal = '
408 < DEGREE : PI/180;
409 < sq(x) : x*x;
410 < Kpola(r) : select(r+1, 0, 5, 15, 25, 35, 45, 55, 65, 75, 90);
411 < Knaz(r) : select(r, 1, 8, 16, 20, 24, 24, 24, 16, 12);
412 < Kaccum(r) : if(r-.5, Knaz(r) + Kaccum(r-1), 0);
413 < Kmax : Kaccum(Knaz(0));
414 < Kfindrow(r, rem) : if(rem-Knaz(r)+.5, Kfindrow(r+1, rem-Knaz(r)), r);
415 < Krow = if(Kbin-(Kmax-.5), 0, Kfindrow(1, Kbin));
416 < Kcol = Kbin - Kaccum(Krow-1);
417 < Kazi = 360*DEGREE * (Kcol + (.5 - x2)) / Knaz(Krow);
418 < Kpol = DEGREE * (x1*Kpola(Krow) + (1-x1)*Kpola(Krow-1));
419 < sin_kpol = sin(Kpol);
420 < Dx = cos(Kazi)*sin_kpol;
421 < Dy = sin(Kazi)*sin_kpol;
422 < Dz = sqrt(1 - sin_kpol*sin_kpol);
423 < KprojOmega = PI * if(Kbin-.5,
424 <        (sq(cos(Kpola(Krow-1)*DEGREE)) - sq(cos(Kpola(Krow)*DEGREE)))/Knaz(Krow),
425 <        1 - sq(cos(Kpola(1)*DEGREE)));
426 < ';
427 < # Compute Klems bin from exiting ray direction (forward or backward)
428 < $kcal = '
429 < DEGREE : PI/180;
430 < abs(x) : if(x, x, -x);
431 < Acos(x) : if(x-1, 0, if(-1-x, PI, acos(x))) / DEGREE;
432 < posangle(a) : if(-a, a + 2*PI, a);
366 < Atan2(y,x) : posangle(atan2(y,x)) / DEGREE;
367 < kpola(r) : select(r, 5, 15, 25, 35, 45, 55, 65, 75, 90);
368 < knaz(r) : select(r, 1, 8, 16, 20, 24, 24, 24, 16, 12);
369 < kaccum(r) : if(r-.5, knaz(r) + kaccum(r-1), 0);
370 < kfindrow(r, pol) : if(r-kpola(0)+.5, r,
371 <                if(pol-kpola(r), kfindrow(r+1, pol), r) );
372 < kazn(azi,inc) : if((360-.5*inc)-azi, floor((azi+.5*inc)/inc), 0);
373 < kbin2(pol,azi) = select(kfindrow(1, pol),
374 <                kazn(azi,360/knaz(1)),
375 <                kaccum(1) + kazn(azi,360/knaz(2)),
376 <                kaccum(2) + kazn(azi,360/knaz(3)),
377 <                kaccum(3) + kazn(azi,360/knaz(4)),
378 <                kaccum(4) + kazn(azi,360/knaz(5)),
379 <                kaccum(5) + kazn(azi,360/knaz(6)),
380 <                kaccum(6) + kazn(azi,360/knaz(7)),
381 <                kaccum(7) + kazn(azi,360/knaz(8)),
382 <                kaccum(8) + kazn(azi,360/knaz(9))
383 <        );
384 < kbin = kbin2(Acos(abs(Dz)),Atan2(Dy,Dx));
385 < ';
386 < my $ndiv = 145;
387 < # Compute scattering data using rcontrib
388 < my @tfarr;
389 < my @rfarr;
390 < my @tbarr;
391 < my @rbarr;
392 < my $cmd;
393 < my $rtcmd = "rcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
394 <        "-e '$kcal' -b kbin -bn $ndiv " .
395 <        "-o '$td/%s.flt' -m $fmodnm -m $bmodnm $octree";
396 < my $rccmd = "rcalc -e '$tcal' " .
397 <        "-e 'mod(n,d):n-floor(n/d)*d' -e 'Kbin=mod(recno-.999,$ndiv)' " .
398 <        q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega' };
399 < if ( $doforw ) {
400 < $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
401 <        "-e 'xp=(\$3+rand(.12*recno+288))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
402 <        "-e 'yp=(\$2+rand(.37*recno-44))*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
403 <        "-e 'zp:$dim[4]' " .
404 <        q{-e 'Kbin=$1;x1=rand(2.75*recno+3.1);x2=rand(-2.01*recno-3.37)' } .
405 <        q{-e '$1=xp-Dx;$2=yp-Dy;$3=zp-Dz;$4=Dx;$5=Dy;$6=Dz' } .
406 <        "| $rtcmd";
407 < system "$cmd" || die "Failure running: $cmd\n";
408 < @tfarr = `$rccmd $td/$fmodnm.flt`;
409 < die "Failure running: $rccmd $td/$fmodnm.flt\n" if ( $? );
410 < chomp(@tfarr);
411 < @rfarr = `$rccmd $td/$bmodnm.flt`;
412 < die "Failure running: $rccmd $td/$bmodnm.flt\n" if ( $? );
413 < chomp(@rfarr);
414 < }
415 < if ( $doback ) {
416 < $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
417 <        "-e 'xp=(\$3+rand(.35*recno-15))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
418 <        "-e 'yp=(\$2+rand(.86*recno+11))*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
419 <        "-e 'zp:$dim[5]' " .
420 <        q{-e 'Kbin=$1;x1=rand(1.21*recno+2.75);x2=rand(-3.55*recno-7.57)' } .
421 <        q{-e '$1=xp-Dx;$2=yp-Dy;$3=zp+Dz;$4=Dx;$5=Dy;$6=-Dz' } .
422 <        "| $rtcmd";
423 < system "$cmd" || die "Failure running: $cmd\n";
424 < @tbarr = `$rccmd $td/$bmodnm.flt`;
425 < die "Failure running: $rccmd $td/$bmodnm.flt\n" if ( $? );
426 < chomp(@tbarr);
427 < @rbarr = `$rccmd $td/$fmodnm.flt`;
428 < die "Failure running: $rccmd $td/$fmodnm.flt\n" if ( $? );
429 < chomp(@rbarr);
430 < }
431 < # Output angle basis
432 < print
433 < '       <DataDefinition>
434 <                <IncidentDataStructure>Columns</IncidentDataStructure>
435 <                <AngleBasis>
436 <                        <AngleBasisName>LBNL/Klems Full</AngleBasisName>
437 <                        <AngleBasisBlock>
438 <                        <Theta>0</Theta>
439 <                        <nPhis>1</nPhis>
440 <                        <ThetaBounds>
441 <                                <LowerTheta>0</LowerTheta>
442 <                                <UpperTheta>5</UpperTheta>
443 <                        </ThetaBounds>
444 <                        </AngleBasisBlock>
445 <                        <AngleBasisBlock>
446 <                        <Theta>10</Theta>
447 <                        <nPhis>8</nPhis>
448 <                        <ThetaBounds>
449 <                                <LowerTheta>5</LowerTheta>
450 <                                <UpperTheta>15</UpperTheta>
451 <                        </ThetaBounds>
452 <                        </AngleBasisBlock>
453 <                        <AngleBasisBlock>
454 <                        <Theta>20</Theta>
455 <                        <nPhis>16</nPhis>
456 <                        <ThetaBounds>
457 <                                <LowerTheta>15</LowerTheta>
458 <                                <UpperTheta>25</UpperTheta>
459 <                        </ThetaBounds>
460 <                        </AngleBasisBlock>
461 <                        <AngleBasisBlock>
462 <                        <Theta>30</Theta>
463 <                        <nPhis>20</nPhis>
464 <                        <ThetaBounds>
465 <                                <LowerTheta>25</LowerTheta>
466 <                                <UpperTheta>35</UpperTheta>
467 <                        </ThetaBounds>
468 <                        </AngleBasisBlock>
469 <                        <AngleBasisBlock>
470 <                        <Theta>40</Theta>
471 <                        <nPhis>24</nPhis>
472 <                        <ThetaBounds>
473 <                                <LowerTheta>35</LowerTheta>
474 <                                <UpperTheta>45</UpperTheta>
475 <                        </ThetaBounds>
476 <                        </AngleBasisBlock>
477 <                        <AngleBasisBlock>
478 <                        <Theta>50</Theta>
479 <                        <nPhis>24</nPhis>
480 <                        <ThetaBounds>
481 <                                <LowerTheta>45</LowerTheta>
482 <                                <UpperTheta>55</UpperTheta>
483 <                        </ThetaBounds>
484 <                        </AngleBasisBlock>
485 <                        <AngleBasisBlock>
486 <                        <Theta>60</Theta>
487 <                        <nPhis>24</nPhis>
488 <                        <ThetaBounds>
489 <                                <LowerTheta>55</LowerTheta>
490 <                                <UpperTheta>65</UpperTheta>
491 <                        </ThetaBounds>
492 <                        </AngleBasisBlock>
493 <                        <AngleBasisBlock>
494 <                        <Theta>70</Theta>
495 <                        <nPhis>16</nPhis>
496 <                        <ThetaBounds>
497 <                                <LowerTheta>65</LowerTheta>
498 <                                <UpperTheta>75</UpperTheta>
499 <                        </ThetaBounds>
500 <                        </AngleBasisBlock>
501 <                        <AngleBasisBlock>
502 <                        <Theta>82.5</Theta>
503 <                        <nPhis>12</nPhis>
504 <                        <ThetaBounds>
505 <                                <LowerTheta>75</LowerTheta>
506 <                                <UpperTheta>90</UpperTheta>
507 <                        </ThetaBounds>
508 <                        </AngleBasisBlock>
509 <                </AngleBasis>
510 <        </DataDefinition>
511 < ';
512 < if ( $doforw ) {
513 < print
514 < '       <WavelengthData>
515 <                <LayerNumber>System</LayerNumber>
516 <                <Wavelength unit="Integral">Visible</Wavelength>
517 <                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
518 <                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
519 <                <WavelengthDataBlock>
520 <                        <WavelengthDataDirection>Transmission Front</WavelengthDataDirection>
521 <                        <ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
522 <                        <RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
523 <                        <ScatteringDataType>BTDF</ScatteringDataType>
524 <                        <ScatteringData>
525 < ';
526 < # Output front transmission (transposed order)
527 < for (my $od = 0; $od < $ndiv; $od++) {
528 <        for (my $id = 0; $id < $ndiv; $id++) {
529 <                print $tfarr[$ndiv*$id + $od], ",\n";
405 >
406 >        # Run rfluxmtx processes to compute each side
407 >        do_matrix_dir(0) if ( $doback );
408 >        do_matrix_dir(1) if ( $doforw );
409 >
410 > }       # end of sub do_matrix_bsdf()
411 >
412 > # Call rfluxmtx and process tensor tree BSDF for the given direction
413 > sub do_matrix_dir {
414 >        my $forw = shift;
415 >        my $cmd;
416 >        my $sender = ($bsender,$fsender)[$forw];
417 >        $cmd = "$rfluxmtx -fd $sender $receivers -i $octree";
418 >        # print STDERR "Starting: $cmd\n";
419 >        system $cmd;
420 >        die "Failure running rfluxmtx" if ( $? );
421 >        matrix_out($forw);
422 > }       # end of do_matrix_dir()
423 >
424 > sub matrix_out {
425 >        my $forw = shift;
426 >        my ($refldat,$transdat);
427 >        if ( $forw ) {
428 >                $transdat = $facedat;
429 >                $refldat = $behinddat;
430 >        } else {
431 >                $transdat = $behinddat;
432 >                $refldat = $facedat;
433          }
434 <        print "\n";
435 < }
436 < print
437 < '                       </ScatteringData>
438 <                </WavelengthDataBlock>
439 <        </WavelengthData>
537 <        <WavelengthData>
538 <                <LayerNumber>System</LayerNumber>
539 <                <Wavelength unit="Integral">Visible</Wavelength>
540 <                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
541 <                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
542 <                <WavelengthDataBlock>
543 <                        <WavelengthDataDirection>Reflection Front</WavelengthDataDirection>
544 <                        <ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
545 <                        <RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
546 <                        <ScatteringDataType>BTDF</ScatteringDataType>
547 <                        <ScatteringData>
548 < ';
549 < # Output front reflection (transposed order)
550 < for (my $od = 0; $od < $ndiv; $od++) {
551 <        for (my $id = 0; $id < $ndiv; $id++) {
552 <                print $rfarr[$ndiv*$id + $od], ",\n";
434 >        # Output transmission
435 >        my $ttyp = ("tb","tf")[$forw];
436 >        matrix_comp($ttyp, "Visible", $transdat, ($tb,$tf)[$forw]);
437 >        if ( $docolor ) {
438 >                matrix_comp($ttyp, "CIE-X", $transdat, ($tbx,$tfx)[$forw]);
439 >                matrix_comp($ttyp, "CIE-Z", $transdat, ($tbz,$tfz)[$forw]);
440          }
441 <        print "\n";
442 < }
443 < print
444 < '                       </ScatteringData>
445 <                </WavelengthDataBlock>
446 <        </WavelengthData>
560 < ';
561 < }
562 < if ( $doback ) {
563 < print
564 < '       <WavelengthData>
565 <                <LayerNumber>System</LayerNumber>
566 <                <Wavelength unit="Integral">Visible</Wavelength>
567 <                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
568 <                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
569 <                <WavelengthDataBlock>
570 <                        <WavelengthDataDirection>Transmission Back</WavelengthDataDirection>
571 <                        <ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
572 <                        <RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
573 <                        <ScatteringDataType>BTDF</ScatteringDataType>
574 <                        <ScatteringData>
575 < ';
576 < # Output back transmission (transposed order)
577 < for (my $od = 0; $od < $ndiv; $od++) {
578 <        for (my $id = 0; $id < $ndiv; $id++) {
579 <                print $tbarr[$ndiv*$id + $od], ",\n";
441 >        # Output reflection
442 >        my $rtyp = ("rb","rf")[$forw];
443 >        matrix_comp($rtyp, "Visible", $refldat, ($rb,$rf)[$forw]);
444 >        if ( $docolor ) {
445 >                matrix_comp($rtyp, "CIE-X", $refldat, ($rbx,$rfx)[$forw]);
446 >                matrix_comp($rtyp, "CIE-Z", $refldat, ($rbz,$rfz)[$forw]);
447          }
448 <        print "\n";
449 < }
450 < print
451 < '                       </ScatteringData>
452 <                </WavelengthDataBlock>
453 <        </WavelengthData>
454 <        <WavelengthData>
455 <                <LayerNumber>System</LayerNumber>
456 <                <Wavelength unit="Integral">Visible</Wavelength>
457 <                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
458 <                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
459 <                <WavelengthDataBlock>
460 <                        <WavelengthDataDirection>Reflection Back</WavelengthDataDirection>
461 <                        <ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
462 <                        <RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
596 <                        <ScatteringDataType>BTDF</ScatteringDataType>
597 <                        <ScatteringData>
598 < ';
599 < # Output back reflection (transposed order)
600 < for (my $od = 0; $od < $ndiv; $od++) {
601 <        for (my $id = 0; $id < $ndiv; $id++) {
602 <                print $rbarr[$ndiv*$id + $od], ",\n";
448 > }       # end of matrix_out()
449 >
450 > # Transpose matrix component data and save to file
451 > sub matrix_comp {
452 >        my $typ = shift;
453 >        my $spec = shift;
454 >        my $src = shift;
455 >        my $dest = shift;
456 >        my $cmd = "rmtxop -fa -t";
457 >        if ("$spec" eq "Visible") {
458 >                $cmd .= " -c 0.2651 0.6701 0.0648";
459 >        } elsif ("$spec" eq "CIE-X") {
460 >                $cmd .= " -c 0.5141 0.3239 0.1620";
461 >        } elsif ("$spec" eq "CIE-Z") {
462 >                $cmd .= " -c 0.0241 0.1229 0.8530";
463          }
464 <        print "\n";
465 < }
466 < print
467 < '                       </ScatteringData>
468 <                </WavelengthDataBlock>
469 <        </WavelengthData>
470 < ';
471 < }
472 < }
473 < #------------- End of do_matrix_bsdf() --------------#
464 >        $cmd .= " $src | rcollate -ho -oc 145";
465 >        # print STDERR "Running: $cmd\n";
466 >        system "$cmd > $dest";
467 >        die "Failure running rttree_reduce" if ( $? );
468 >        if ( "$spec" ne "$curspec" ) {
469 >                $wrapper .= " -s $spec";
470 >                $curspec = $spec;
471 >        }
472 >        $wrapper .= " -$typ $dest";
473 > }       # end of matrix_comp()
474 >
475 > #------------- End of do_matrix_bsdf() & subroutines --------------#

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines