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.16 by greg, Tue May 31 20:50:26 2011 UTC vs.
Revision 2.33 by greg, Tue Mar 6 04:41:31 2012 UTC

# Line 8 | Line 8
8   use strict;
9   use File::Temp qw/ :mktemp  /;
10   sub userror {
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] [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 = mkdtemp("/tmp/genBSDF.XXXXXX");
15   chomp $td;
16 + my @savedARGV = @ARGV;
17   my $tensortree = 0;
18   my $ttlog2 = 4;
19 < my $nsamp = 1000;
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 = 90;
27 + my $gunit = "Meter";
28   my @dim;
29   # Get options
30   while ($#ARGV >= 0) {
# Line 32 | 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 +                # Use value < 0 for rttree_reduce bypass
49 +                $pctcull = $ARGV[1];
50 +                shift @ARGV;
51          } elsif ("$ARGV[0]" =~ /^-t[34]$/) {
52                  $tensortree = substr($ARGV[0], 2, 1);
53                  $ttlog2 = $ARGV[1];
# Line 98 | Line 110 | die "Could not compile scene\n" if ( $? );
110   print
111   '<?xml version="1.0" encoding="UTF-8"?>
112   <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">
113 < <WindowElementType>System</WindowElementType>
113 > ';
114 > print "<!-- File produced by: genBSDF @savedARGV -->\n";
115 > print
116 > '<WindowElementType>System</WindowElementType>
117   <Optical>
118   <Layer>
119          <Material>
120                  <Name>Name</Name>
121                  <Manufacturer>Manufacturer</Manufacturer>
122   ';
123 < printf "\t\t<Thickness unit=\"Meter\">%.3f</Thickness>\n", $dim[5] - $dim[4];
124 < printf "\t\t<Width unit=\"Meter\">%.3f</Width>\n", $dim[1] - $dim[0];
125 < printf "\t\t<Height unit=\"Meter\">%.3f</Height>\n", $dim[3] - $dim[2];
123 > printf "\t\t<Thickness unit=\"$gunit\">%.3f</Thickness>\n", $dim[5] - $dim[4];
124 > printf "\t\t<Width unit=\"$gunit\">%.3f</Width>\n", $dim[1] - $dim[0];
125 > printf "\t\t<Height unit=\"$gunit\">%.3f</Height>\n", $dim[3] - $dim[2];
126   print "\t\t<DeviceType>Integral</DeviceType>\n";
127   # Output MGF description if requested
128   if ( $geout ) {
129 <        print "\t\t<Geometry format=\"MGF\" unit=\"Meter\">\n";
129 >        print "\t\t<Geometry format=\"MGF\" unit=\"$gunit\">\n";
130          printf "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
131          open(MGFSCN, "< $mgfscn");
132          while (<MGFSCN>) { print $_; }
# Line 139 | Line 154 | print
154   </WindowElement>
155   ';
156   # Clean up temporary files and exit
142 – if ( $persistfile && open(PFI, "< $persistfile") ) {
143 –        while (<PFI>) {
144 –                s/^[^ ]* //;
145 –                kill('ALRM', $_);
146 –                last;
147 –        }
148 –        close PFI;
149 – }
157   exec("rm -rf $td");
158  
159   #-------------- End of main program segment --------------#
160  
161 + #++++++++++++++ Kill persistent rtrace +++++++++++++++++++#
162 + sub persist_end {
163 +        if ( $persistfile && open(PFI, "< $persistfile") ) {
164 +                while (<PFI>) {
165 +                        s/^[^ ]* //;
166 +                        kill('ALRM', $_);
167 +                        last;
168 +                }
169 +                close PFI;
170 +        }
171 + }
172 +
173   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
174   sub do_tree_bsdf {
175   # Get sampling rate and subdivide task
176   my $ns2 = $ns;
177   $ns2 /= 2 if ( $tensortree == 3 );
178 < @pdiv = (0, int($ns2/$nproc));
179 < my $nrem = $ns2 % $nproc;
180 < for (my $i = 1; $i < $nproc; $i++) {
178 > my $nsplice = $nproc;
179 > $nsplice *= 10 if ($nproc > 1);
180 > $nsplice = $ns2 if ($nsplice > $ns2);
181 > $nsplice = 999 if ($nsplice > 999);
182 > @pdiv = (0, int($ns2/$nsplice));
183 > my $nrem = $ns2 % $nsplice;
184 > for (my $i = 1; $i < $nsplice; $i++) {
185          my $nv = $pdiv[$i] + $pdiv[1];
186          ++$nv if ( $nrem-- > 0 );
187          push @pdiv, $nv;
# Line 207 | Line 230 | print "\t<DataDefinition>\n";
230   print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
231   print "\t</DataDefinition>\n";
232   # Fork parallel rtcontrib processes to compute each side
233 + my $npleft = $nproc;
234   if ( $doback ) {
235 <        for (my $proc = 0; $proc < $nproc; $proc++) {
236 <                bg_tree_rtcontrib(0, $proc);
235 >        for (my $splice = 0; $splice < $nsplice; $splice++) {
236 >                if (! $npleft ) {
237 >                        wait();
238 >                        die "rtcontrib process reported error" if ( $? );
239 >                        $npleft++;
240 >                }
241 >                bg_tree_rtcontrib(0, $splice);
242 >                $npleft--;
243          }
244          while (wait() >= 0) {
245                  die "rtcontrib process reported error" if ( $? );
246 +                $npleft++;
247          }
248 +        persist_end();
249          ttree_out(0);
250   }
251   if ( $doforw ) {
252 <        for (my $proc = 0; $proc < $nproc; $proc++) {
253 <                bg_tree_rtcontrib(1, $proc);
252 >        for (my $splice = 0; $splice < $nsplice; $splice++) {
253 >                if (! $npleft ) {
254 >                        wait();
255 >                        die "rtcontrib process reported error" if ( $? );
256 >                        $npleft++;
257 >                }
258 >                bg_tree_rtcontrib(1, $splice);
259 >                $npleft--;
260          }
261          while (wait() >= 0) {
262                  die "rtcontrib process reported error" if ( $? );
263 +                $npleft++;
264          }
265 +        persist_end();
266          ttree_out(1);
267   }
268   }       # end of sub do_tree_bsdf()
269  
270 < # Run i'th rtcontrib process for generating tensor tree samples
270 > # Run rtcontrib process in background to generate tensor tree samples
271   sub bg_tree_rtcontrib {
272          my $pid = fork();
273          die "Cannot fork new process" unless defined $pid;
# Line 248 | Line 288 | sub bg_tree_rtcontrib {
288                          "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
289                          "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
290                          "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
291 <                        "-e 'Dx=1-($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
291 >                        "-e 'Dx=1-2*($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
292                          "-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
293                          "-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
294                          "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
# Line 282 | Line 322 | sub bg_tree_rtcontrib {
322   sub ttree_out {
323          my $forw = shift;
324          my $side = ("Back","Front")[$forw];
325 +        my $cmd;
326   # Only output one transmitted distribution, preferring backwards
327   if ( !$forw || !$doback ) {
328   print
# Line 296 | Line 337 | print
337                          <ScatteringDataType>BTDF</ScatteringDataType>
338                          <ScatteringData>
339   ';
340 < system "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
341 <        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' -of } .
342 <        "$td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt " .
343 <        "| rttree_reduce -h -ff -r $tensortree -g $ttlog2";
344 < die "Failure running rttree_reduce" if ( $? );
340 > $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
341 >        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
342 > if ($pctcull >= 0) {
343 >        $cmd .= "-of $td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt " .
344 >        "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
345 >        system "$cmd" || die "Failure running rttree_reduce";
346 > } else {
347 >        $cmd .= "$td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt";
348 >        print "{\n";
349 >        system "$cmd" || die "Failure running rcalc";
350 >        print "}\n";
351 > }
352   print
353   '                       </ScatteringData>
354                  </WavelengthDataBlock>
# Line 315 | Line 363 | print
363                  <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
364                  <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
365                  <WavelengthDataBlock>
366 <                        <WavelengthDataDirection>Reflection $side</WavelengthDataDirection>
367 <                        <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
366 > ';
367 > print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
368 > print
369 > '                       <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
370                          <ScatteringDataType>BRDF</ScatteringDataType>
371                          <ScatteringData>
372   ';
373 < system "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
374 <        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' -of } .
375 <        "$td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt " .
376 <        "| rttree_reduce -h -ff -r $tensortree -g $ttlog2";
377 < die "Failure running rttree_reduce" if ( $? );
373 > $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
374 >        q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
375 > if ($pctcull >= 0) {
376 >        $cmd .= "-of $td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt " .
377 >        "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
378 >        system "$cmd" || die "Failure running rttree_reduce";
379 > } else {
380 >        $cmd .= "$td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt";
381 >        print "{\n";
382 >        system "$cmd" || die "Failure running rcalc";
383 >        print "}\n";
384 > }
385   print
386   '                       </ScatteringData>
387                  </WavelengthDataBlock>
# Line 362 | Line 419 | KprojOmega = PI * if(Kbin-.5,
419   $kcal = '
420   DEGREE : PI/180;
421   abs(x) : if(x, x, -x);
422 < Acos(x) : 1/DEGREE * if(x-1, 0, if(-1-x, 0, acos(x)));
422 > Acos(x) : if(x-1, 0, if(-1-x, PI, acos(x))) / DEGREE;
423   posangle(a) : if(-a, a + 2*PI, a);
424 < Atan2(y,x) : 1/DEGREE * posangle(atan2(y,x));
424 > Atan2(y,x) : posangle(atan2(y,x)) / DEGREE;
425   kpola(r) : select(r, 5, 15, 25, 35, 45, 55, 65, 75, 90);
426   knaz(r) : select(r, 1, 8, 16, 20, 24, 24, 24, 16, 12);
427   kaccum(r) : if(r-.5, knaz(r) + kaccum(r-1), 0);
# Line 396 | Line 453 | my $rtcmd = "rtcontrib $rtargs -h -ff -fo -n $nproc -c
453          "-o '$td/%s.flt' -m $fmodnm -m $bmodnm $octree";
454   my $rccmd = "rcalc -e '$tcal' " .
455          "-e 'mod(n,d):n-floor(n/d)*d' -e 'Kbin=mod(recno-.999,$ndiv)' " .
456 <        q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega'};
456 >        q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega' };
457   if ( $doforw ) {
458   $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
459          "-e 'xp=(\$3+rand(.12*recno+288))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
# Line 422 | Line 479 | $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
479   system "$cmd" || die "Failure running: $cmd\n";
480   @tbarr = `$rccmd $td/$bmodnm.flt`;
481   die "Failure running: $rccmd $td/$bmodnm.flt\n" if ( $? );
482 + chomp(@tbarr);
483   @rbarr = `$rccmd $td/$fmodnm.flt`;
484   die "Failure running: $rccmd $td/$fmodnm.flt\n" if ( $? );
485 + chomp(@rbarr);
486   }
487   # Output angle basis
488   print
# Line 523 | Line 582 | print
582   # Output front transmission (transposed order)
583   for (my $od = 0; $od < $ndiv; $od++) {
584          for (my $id = 0; $id < $ndiv; $id++) {
585 <                print $tfarr[$ndiv*$id + $od];
585 >                print $tfarr[$ndiv*$id + $od], ",\n";
586          }
587          print "\n";
588   }
# Line 546 | Line 605 | print
605   # Output front reflection (transposed order)
606   for (my $od = 0; $od < $ndiv; $od++) {
607          for (my $id = 0; $id < $ndiv; $id++) {
608 <                print $rfarr[$ndiv*$id + $od];
608 >                print $rfarr[$ndiv*$id + $od], ",\n";
609          }
610          print "\n";
611   }
# Line 573 | Line 632 | print
632   # Output back transmission (transposed order)
633   for (my $od = 0; $od < $ndiv; $od++) {
634          for (my $id = 0; $id < $ndiv; $id++) {
635 <                print $tbarr[$ndiv*$id + $od];
635 >                print $tbarr[$ndiv*$id + $od], ",\n";
636          }
637          print "\n";
638   }
# Line 596 | Line 655 | print
655   # Output back reflection (transposed order)
656   for (my $od = 0; $od < $ndiv; $od++) {
657          for (my $id = 0; $id < $ndiv; $id++) {
658 <                print $rbarr[$ndiv*$id + $od];
658 >                print $rbarr[$ndiv*$id + $od], ",\n";
659          }
660          print "\n";
661   }

Diff Legend

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