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.12 by greg, Thu Feb 24 20:27:00 2011 UTC vs.
Revision 2.32 by greg, Thu Feb 23 21:28:42 2012 UTC

# Line 6 | Line 6
6   #       G. Ward
7   #
8   use strict;
9 + use File::Temp qw/ :mktemp  /;
10   sub userror {
11 <        print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-r \"ropts\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom] [input ..]\n";
11 >        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          exit 1;
13   }
14 < my $td = `mktemp -d /tmp/genBSDF.XXXXXX`;
14 > my $td = mkdtemp("/tmp/genBSDF.XXXXXX");
15   chomp $td;
16 < my $nsamp = 1000;
16 > my @savedARGV = @ARGV;
17 > my $tensortree = 0;
18 > my $ttlog2 = 4;
19 > my $nsamp = 2000;
20   my $rtargs = "-w -ab 5 -ad 700 -lw 3e-6";
21   my $mgfin = 0;
22   my $geout = 1;
23   my $nproc = 1;
24   my $doforw = 0;
25   my $doback = 1;
26 + my $pctcull = 95;
27 + my $gunit = "Meter";
28   my @dim;
29   # Get options
30   while ($#ARGV >= 0) {
# Line 29 | Line 35 | while ($#ARGV >= 0) {
35                  shift @ARGV;
36          } elsif ("$ARGV[0]" =~ /^[-+]g/) {
37                  $geout = ("$ARGV[0]" =~ /^\+/);
38 +                $gunit = $ARGV[1];
39 +                if ($gunit !~ /^(?i)(meter|foot|inch|centimeter|millimeter)$/) {
40 +                        die "Illegal geometry unit '$gunit': must be meter, foot, inch, centimeter, or millimeter\n";
41 +                }
42 +                shift @ARGV;
43          } elsif ("$ARGV[0]" =~ /^[-+]f/) {
44                  $doforw = ("$ARGV[0]" =~ /^\+/);
45          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
46                  $doback = ("$ARGV[0]" =~ /^\+/);
47 +        } elsif ("$ARGV[0]" eq "-t") {
48 +                $pctcull = $ARGV[1];
49 +                shift @ARGV;
50 +        } elsif ("$ARGV[0]" =~ /^-t[34]$/) {
51 +                $tensortree = substr($ARGV[0], 2, 1);
52 +                $ttlog2 = $ARGV[1];
53 +                shift @ARGV;
54          } elsif ("$ARGV[0]" eq "-c") {
55                  $nsamp = $ARGV[1];
56                  shift @ARGV;
# Line 51 | Line 69 | while ($#ARGV >= 0) {
69          shift @ARGV;
70   }
71   # Check that we're actually being asked to do something
72 < die "Must have at least one of +forward or +backward" if (!$doforw && !$doback);
72 > die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
73 > # Name our own persist file?
74 > my $persistfile;
75 > if ( $tensortree && $nproc > 1 && "$rtargs" !~ /-PP /) {
76 >        $persistfile = "$td/pfile.txt";
77 >        $rtargs = "-PP $persistfile $rtargs";
78 > }
79   # Get scene description and dimensions
80   my $radscn = "$td/device.rad";
81   my $mgfscn = "$td/device.mgf";
# Line 61 | Line 85 | if ( $mgfin ) {
85          die "Could not load MGF input\n" if ( $? );
86          system "mgf2rad $mgfscn > $radscn";
87   } else {
88 <        system "cat @ARGV | xform -e > $radscn";
88 >        system "xform -e @ARGV > $radscn";
89          die "Could not load Radiance input\n" if ( $? );
90          system "rad2mgf $radscn > $mgfscn" if ( $geout );
91   }
# Line 81 | Line 105 | close RADSCN;
105   # Generate octree
106   system "oconv -w $radscn > $octree";
107   die "Could not compile scene\n" if ( $? );
108 < # Set up sampling of interior portal
108 > # Output XML prologue
109 > print
110 > '<?xml version="1.0" encoding="UTF-8"?>
111 > <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">
112 > ';
113 > print "<!-- File produced by: genBSDF @savedARGV -->\n";
114 > print
115 > '<WindowElementType>System</WindowElementType>
116 > <Optical>
117 > <Layer>
118 >        <Material>
119 >                <Name>Name</Name>
120 >                <Manufacturer>Manufacturer</Manufacturer>
121 > ';
122 > printf "\t\t<Thickness unit=\"$gunit\">%.3f</Thickness>\n", $dim[5] - $dim[4];
123 > printf "\t\t<Width unit=\"$gunit\">%.3f</Width>\n", $dim[1] - $dim[0];
124 > printf "\t\t<Height unit=\"$gunit\">%.3f</Height>\n", $dim[3] - $dim[2];
125 > print "\t\t<DeviceType>Integral</DeviceType>\n";
126 > # Output MGF description if requested
127 > if ( $geout ) {
128 >        print "\t\t<Geometry format=\"MGF\" unit=\"$gunit\">\n";
129 >        printf "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
130 >        open(MGFSCN, "< $mgfscn");
131 >        while (<MGFSCN>) { print $_; }
132 >        close MGFSCN;
133 >        print "xf\n";
134 >        print "\t\t</Geometry>\n";
135 > }
136 > print " </Material>\n";
137 > # Set up surface sampling
138 > my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + .5);
139 > my $ny = int($nsamp/$nx + .5);
140 > $nsamp = $nx * $ny;
141 > my $ns = 2**$ttlog2;
142 > my (@pdiv, $disk2sq, $sq2disk, $tcal, $kcal);
143 > # Create data segments (all the work happens here)
144 > if ( $tensortree ) {
145 >        do_tree_bsdf();
146 > } else {
147 >        do_matrix_bsdf();
148 > }
149 > # Output XML epilogue
150 > print
151 > '</Layer>
152 > </Optical>
153 > </WindowElement>
154 > ';
155 > # Clean up temporary files and exit
156 > exec("rm -rf $td");
157 >
158 > #-------------- End of main program segment --------------#
159 >
160 > #++++++++++++++ Kill persistent rtrace +++++++++++++++++++#
161 > sub persist_end {
162 >        if ( $persistfile && open(PFI, "< $persistfile") ) {
163 >                while (<PFI>) {
164 >                        s/^[^ ]* //;
165 >                        kill('ALRM', $_);
166 >                        last;
167 >                }
168 >                close PFI;
169 >        }
170 > }
171 >
172 > #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
173 > sub do_tree_bsdf {
174 > # Get sampling rate and subdivide task
175 > my $ns2 = $ns;
176 > $ns2 /= 2 if ( $tensortree == 3 );
177 > my $nsplice = $nproc;
178 > $nsplice *= 10 if ($nproc > 1);
179 > $nsplice = $ns2 if ($nsplice > $ns2);
180 > $nsplice = 999 if ($nsplice > 999);
181 > @pdiv = (0, int($ns2/$nsplice));
182 > my $nrem = $ns2 % $nsplice;
183 > for (my $i = 1; $i < $nsplice; $i++) {
184 >        my $nv = $pdiv[$i] + $pdiv[1];
185 >        ++$nv if ( $nrem-- > 0 );
186 >        push @pdiv, $nv;
187 > }
188 > die "Script error 1" if ($pdiv[-1] != $ns2);
189 > # Shirley-Chiu mapping from unit square to disk
190 > $sq2disk = '
191 > in_square_a = 2*in_square_x - 1;
192 > in_square_b = 2*in_square_y - 1;
193 > in_square_rgn = if(in_square_a + in_square_b,
194 >                        if(in_square_a - in_square_b, 1, 2),
195 >                        if(in_square_b - in_square_a, 3, 4));
196 > out_disk_r = .999995*select(in_square_rgn, in_square_a, in_square_b,
197 >                        -in_square_a, -in_square_b);
198 > out_disk_phi = PI/4 * select(in_square_rgn,
199 >                                in_square_b/in_square_a,
200 >                                2 - in_square_a/in_square_b,
201 >                                4 + in_square_b/in_square_a,
202 >                                if(in_square_b*in_square_b,
203 >                                        6 - in_square_a/in_square_b, 0));
204 > Dx = out_disk_r*cos(out_disk_phi);
205 > Dy = out_disk_r*sin(out_disk_phi);
206 > Dz = sqrt(1 - out_disk_r*out_disk_r);
207 > ';
208 > # Shirley-Chiu mapping from unit disk to square
209 > $disk2sq = '
210 > norm_radians(p) : if(-p - PI/4, p + 2*PI, p);
211 > in_disk_r = .999995*sqrt(Dx*Dx + Dy*Dy);
212 > in_disk_phi = norm_radians(atan2(Dy, Dx));
213 > in_disk_rgn = floor((in_disk_phi + PI/4)/(PI/2)) + 1;
214 > out_square_a = select(in_disk_rgn,
215 >                        in_disk_r,
216 >                        (PI/2 - in_disk_phi)*in_disk_r/(PI/4),
217 >                        -in_disk_r,
218 >                        (in_disk_phi - 3*PI/2)*in_disk_r/(PI/4));
219 > out_square_b = select(in_disk_rgn,
220 >                        in_disk_phi*in_disk_r/(PI/4),
221 >                        in_disk_r,
222 >                        (PI - in_disk_phi)*in_disk_r/(PI/4),
223 >                        -in_disk_r);
224 > out_square_x = (out_square_a + 1)/2;
225 > out_square_y = (out_square_b + 1)/2;
226 > ';
227 > # Announce ourselves in XML output
228 > print "\t<DataDefinition>\n";
229 > print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
230 > print "\t</DataDefinition>\n";
231 > # Fork parallel rtcontrib processes to compute each side
232 > my $npleft = $nproc;
233 > if ( $doback ) {
234 >        for (my $splice = 0; $splice < $nsplice; $splice++) {
235 >                if (! $npleft ) {
236 >                        wait();
237 >                        die "rtcontrib process reported error" if ( $? );
238 >                        $npleft++;
239 >                }
240 >                bg_tree_rtcontrib(0, $splice);
241 >                $npleft--;
242 >        }
243 >        while (wait() >= 0) {
244 >                die "rtcontrib process reported error" if ( $? );
245 >                $npleft++;
246 >        }
247 >        persist_end();
248 >        ttree_out(0);
249 > }
250 > if ( $doforw ) {
251 >        for (my $splice = 0; $splice < $nsplice; $splice++) {
252 >                if (! $npleft ) {
253 >                        wait();
254 >                        die "rtcontrib process reported error" if ( $? );
255 >                        $npleft++;
256 >                }
257 >                bg_tree_rtcontrib(1, $splice);
258 >                $npleft--;
259 >        }
260 >        while (wait() >= 0) {
261 >                die "rtcontrib process reported error" if ( $? );
262 >                $npleft++;
263 >        }
264 >        persist_end();
265 >        ttree_out(1);
266 > }
267 > }       # end of sub do_tree_bsdf()
268 >
269 > # Run rtcontrib process in background to generate tensor tree samples
270 > sub bg_tree_rtcontrib {
271 >        my $pid = fork();
272 >        die "Cannot fork new process" unless defined $pid;
273 >        if ($pid > 0) { return $pid; }
274 >        my $forw = shift;
275 >        my $pn = shift;
276 >        my $pbeg = $pdiv[$pn];
277 >        my $plen = $pdiv[$pn+1] - $pbeg;
278 >        my $matargs = "-m $bmodnm";
279 >        if ( !$forw || !$doback ) { $matargs .= " -m $fmodnm"; }
280 >        my $cmd = "rtcontrib $rtargs -h -ff -fo -c $nsamp " .
281 >                "-e '$disk2sq' -bn '$ns*$ns' " .
282 >                "-b '$ns*floor(out_square_x*$ns)+floor(out_square_y*$ns)' " .
283 >                "-o $td/%s_" . sprintf("%03d", $pn) . ".flt $matargs $octree";
284 >        if ( $tensortree == 3 ) {
285 >                # Isotropic BSDF
286 >                $cmd = "cnt $plen $ny $nx " .
287 >                        "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
288 >                        "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
289 >                        "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
290 >                        "-e 'Dx=1-2*($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
291 >                        "-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
292 >                        "-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
293 >                        "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
294 >                        "-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' " .
295 >                        "-e '\$4=Dx;\$5=Dy;\$6=myDz' -of " .
296 >                        "| $cmd";
297 >        } else {
298 >                # Anisotropic BSDF
299 >                # Sample area vertically to improve load balance, since
300 >                # shading systems usually have bilateral symmetry (L-R)
301 >                $cmd = "cnt $plen $ns $ny $nx " .
302 >                        "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
303 >                        "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
304 >                        "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
305 >                        "-e 'r4=rand(($pn-2.3857833)*recno-964.72738)' " .
306 >                        "-e 'in_square_x=($pbeg+\$1+r1)/$ns' " .
307 >                        "-e 'in_square_y=(\$2+r2)/$ns' -e '$sq2disk' " .
308 >                        "-e 'xp=(\$4+r3)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
309 >                        "-e 'yp=(\$3+r4)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
310 >                        "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
311 >                        "-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' " .
312 >                        "-e '\$4=Dx;\$5=Dy;\$6=myDz' -of " .
313 >                        "| $cmd";
314 >        }
315 > # print STDERR "Starting: $cmd\n";
316 >        exec($cmd);             # no return; status report to parent via wait
317 >        die "Cannot exec: $cmd\n";
318 > }       # end of bg_tree_rtcontrib()
319 >
320 > # Simplify and output tensor tree results
321 > sub ttree_out {
322 >        my $forw = shift;
323 >        my $side = ("Back","Front")[$forw];
324 > # Only output one transmitted distribution, preferring backwards
325 > if ( !$forw || !$doback ) {
326 > print
327 > '       <WavelengthData>
328 >                <LayerNumber>System</LayerNumber>
329 >                <Wavelength unit="Integral">Visible</Wavelength>
330 >                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
331 >                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
332 >                <WavelengthDataBlock>
333 >                        <WavelengthDataDirection>Transmission</WavelengthDataDirection>
334 >                        <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
335 >                        <ScatteringDataType>BTDF</ScatteringDataType>
336 >                        <ScatteringData>
337 > ';
338 > system "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
339 >        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' -of } .
340 >        "$td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt " .
341 >        "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
342 > die "Failure running rttree_reduce" if ( $? );
343 > print
344 > '                       </ScatteringData>
345 >                </WavelengthDataBlock>
346 >        </WavelengthData>
347 > ';
348 > }
349 > # Output reflection
350 > print
351 > '       <WavelengthData>
352 >                <LayerNumber>System</LayerNumber>
353 >                <Wavelength unit="Integral">Visible</Wavelength>
354 >                <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
355 >                <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
356 >                <WavelengthDataBlock>
357 > ';
358 > print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
359 > print
360 > '                       <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
361 >                        <ScatteringDataType>BRDF</ScatteringDataType>
362 >                        <ScatteringData>
363 > ';
364 > system "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
365 >        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' -of } .
366 >        "$td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt " .
367 >        "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
368 > die "Failure running rttree_reduce" if ( $? );
369 > print
370 > '                       </ScatteringData>
371 >                </WavelengthDataBlock>
372 >        </WavelengthData>
373 > ';
374 > }       # end of ttree_out()
375 >
376 > #------------- End of do_tree_bsdf() & subroutines -------------#
377 >
378 > #+++++++++++++++ Klems matrix BSDF generation +++++++++++++++#
379 > sub do_matrix_bsdf {
380 > # Set up sampling of portal
381   # Kbin to produce incident direction in full Klems basis with (x1,x2) randoms
382 < my $tcal = '
382 > $tcal = '
383   DEGREE : PI/180;
384   sq(x) : x*x;
385   Kpola(r) : select(r+1, -5, 5, 15, 25, 35, 45, 55, 65, 75, 90);
# Line 104 | Line 400 | KprojOmega = PI * if(Kbin-.5,
400          1 - sq(cos(Kpola(1)*DEGREE)));
401   ';
402   # Compute Klems bin from exiting ray direction (forward or backward)
403 < my $kcal = '
403 > $kcal = '
404   DEGREE : PI/180;
405   abs(x) : if(x, x, -x);
406 < Acos(x) : 1/DEGREE * if(x-1, 0, if(-1-x, 0, acos(x)));
406 > Acos(x) : if(x-1, 0, if(-1-x, PI, acos(x))) / DEGREE;
407   posangle(a) : if(-a, a + 2*PI, a);
408 < Atan2(y,x) : 1/DEGREE * posangle(atan2(y,x));
408 > Atan2(y,x) : posangle(atan2(y,x)) / DEGREE;
409   kpola(r) : select(r, 5, 15, 25, 35, 45, 55, 65, 75, 90);
410   knaz(r) : select(r, 1, 8, 16, 20, 24, 24, 24, 16, 12);
411   kaccum(r) : if(r-.5, knaz(r) + kaccum(r-1), 0);
# Line 130 | Line 426 | kbin2(pol,azi) = select(kfindrow(1, pol),
426   kbin = kbin2(Acos(abs(Dz)),Atan2(Dy,Dx));
427   ';
428   my $ndiv = 145;
133 my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + .5);
134 my $ny = int($nsamp/$nx + .5);
135 $nsamp = $nx * $ny;
429   # Compute scattering data using rtcontrib
430   my @tfarr;
431   my @rfarr;
432   my @tbarr;
433   my @rbarr;
434   my $cmd;
435 < my $rtcmd = "rtcontrib -h -ff -fo -n $nproc -c $nsamp " .
435 > my $rtcmd = "rtcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
436          "-e '$kcal' -b kbin -bn $ndiv " .
437 <        "-o '$td/%s.flt' -m $fmodnm -m $bmodnm $rtargs $octree";
437 >        "-o '$td/%s.flt' -m $fmodnm -m $bmodnm $octree";
438   my $rccmd = "rcalc -e '$tcal' " .
439          "-e 'mod(n,d):n-floor(n/d)*d' -e 'Kbin=mod(recno-.999,$ndiv)' " .
440 <        q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega'};
440 >        q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega' };
441   if ( $doforw ) {
442   $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
443          "-e 'xp=(\$3+rand(.12*recno+288))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
# Line 170 | Line 463 | $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
463   system "$cmd" || die "Failure running: $cmd\n";
464   @tbarr = `$rccmd $td/$bmodnm.flt`;
465   die "Failure running: $rccmd $td/$bmodnm.flt\n" if ( $? );
466 + chomp(@tbarr);
467   @rbarr = `$rccmd $td/$fmodnm.flt`;
468   die "Failure running: $rccmd $td/$fmodnm.flt\n" if ( $? );
469 + chomp(@rbarr);
470   }
471 < # Output XML prologue
471 > # Output angle basis
472   print
473 < '<?xml version="1.0" encoding="UTF-8"?>
474 < <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">
475 <        <WindowElementType>System</WindowElementType>
181 <        <Optical>
182 <                <Layer>
183 <                <Material>
184 <                        <Name>Name</Name>
185 <                        <Manufacturer>Manufacturer</Manufacturer>
186 < ';
187 < printf "\t\t\t<Thickness unit=\"Meter\">%.3f</Thickness>\n", $dim[5] - $dim[4];
188 < printf "\t\t\t<Width unit=\"Meter\">%.3f</Width>\n", $dim[1] - $dim[0];
189 < printf "\t\t\t<Height unit=\"Meter\">%.3f</Height>\n", $dim[3] - $dim[2];
190 < print "\t\t\t<DeviceType>Integral</DeviceType>\n";
191 < # Output MGF description if requested
192 < if ( $geout ) {
193 <        print "\t\t\t<Geometry format=\"MGF\" unit=\"Meter\">\n";
194 <        printf "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
195 <        system "cat $mgfscn";
196 <        print "xf\n";
197 <        print "\t\t\t</Geometry>\n";
198 < }
199 < print '                 </Material>
200 <                <DataDefinition>
201 <                        <IncidentDataStructure>Columns</IncidentDataStructure>
202 <                        <AngleBasis>
473 > '       <DataDefinition>
474 >                <IncidentDataStructure>Columns</IncidentDataStructure>
475 >                <AngleBasis>
476                          <AngleBasisName>LBNL/Klems Full</AngleBasisName>
477 <                                <AngleBasisBlock>
477 >                        <AngleBasisBlock>
478                                  <Theta>0</Theta>
479                                  <nPhis>1</nPhis>
480                                  <ThetaBounds>
481 <                                <LowerTheta>0</LowerTheta>
482 <                                <UpperTheta>5</UpperTheta>
481 >                                        <LowerTheta>0</LowerTheta>
482 >                                        <UpperTheta>5</UpperTheta>
483                                  </ThetaBounds>
484                                  </AngleBasisBlock>
485                                  <AngleBasisBlock>
# Line 277 | Line 550 | print '                        </Material>
550          </DataDefinition>
551   ';
552   if ( $doforw ) {
553 < print '         <WavelengthData>
553 > print
554 > '       <WavelengthData>
555                  <LayerNumber>System</LayerNumber>
556                  <Wavelength unit="Integral">Visible</Wavelength>
557                  <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
# Line 292 | Line 566 | print '                <WavelengthData>
566   # Output front transmission (transposed order)
567   for (my $od = 0; $od < $ndiv; $od++) {
568          for (my $id = 0; $id < $ndiv; $id++) {
569 <                print $tfarr[$ndiv*$id + $od];
569 >                print $tfarr[$ndiv*$id + $od], ",\n";
570          }
571          print "\n";
572   }
573   print
574 < '               </ScatteringData>
575 <        </WavelengthDataBlock>
574 > '                       </ScatteringData>
575 >                </WavelengthDataBlock>
576          </WavelengthData>
577          <WavelengthData>
578                  <LayerNumber>System</LayerNumber>
# Line 315 | Line 589 | print
589   # Output front reflection (transposed order)
590   for (my $od = 0; $od < $ndiv; $od++) {
591          for (my $id = 0; $id < $ndiv; $id++) {
592 <                print $rfarr[$ndiv*$id + $od];
592 >                print $rfarr[$ndiv*$id + $od], ",\n";
593          }
594          print "\n";
595   }
596   print
597 < '               </ScatteringData>
598 <        </WavelengthDataBlock>
597 > '                       </ScatteringData>
598 >                </WavelengthDataBlock>
599          </WavelengthData>
600   ';
601   }
602   if ( $doback ) {
603 < print '         <WavelengthData>
603 > print
604 > '       <WavelengthData>
605                  <LayerNumber>System</LayerNumber>
606                  <Wavelength unit="Integral">Visible</Wavelength>
607                  <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
# Line 341 | Line 616 | print '                <WavelengthData>
616   # Output back transmission (transposed order)
617   for (my $od = 0; $od < $ndiv; $od++) {
618          for (my $id = 0; $id < $ndiv; $id++) {
619 <                print $tbarr[$ndiv*$id + $od];
619 >                print $tbarr[$ndiv*$id + $od], ",\n";
620          }
621          print "\n";
622   }
623   print
624 < '               </ScatteringData>
625 <        </WavelengthDataBlock>
624 > '                       </ScatteringData>
625 >                </WavelengthDataBlock>
626          </WavelengthData>
627          <WavelengthData>
628                  <LayerNumber>System</LayerNumber>
# Line 361 | Line 636 | print
636                          <ScatteringDataType>BRDF</ScatteringDataType>
637                          <ScatteringData>
638   ';
639 < # Output back reflection (transposed order)
639 > # Output back reflection (reciprocity averaging)
640   for (my $od = 0; $od < $ndiv; $od++) {
641          for (my $id = 0; $id < $ndiv; $id++) {
642 <                print $rbarr[$ndiv*$id + $od];
642 >                print $rbarr[$ndiv*$id + $od], ",\n";
643          }
644          print "\n";
645   }
646   print
647 < '               </ScatteringData>
648 <        </WavelengthDataBlock>
647 > '                       </ScatteringData>
648 >                </WavelengthDataBlock>
649          </WavelengthData>
650   ';
651   }
652 < # Output XML epilogue
653 < print '</Layer>
379 < </Optical>
380 < </WindowElement>
381 < ';
382 < # Clean up temporary files
383 < system "rm -rf $td";
652 > }
653 > #------------- End of do_matrix_bsdf() --------------#

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines