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.35 by greg, Wed May 9 17:40:17 2012 UTC vs.
Revision 2.43 by greg, Mon Aug 5 22:56:50 2013 UTC

# Line 24 | Line 24 | my $nproc = 1;
24   my $doforw = 0;
25   my $doback = 1;
26   my $pctcull = 90;
27 < my $gunit = "Meter";
27 > my $gunit = "meter";
28   my @dim;
29   # Get options
30   while ($#ARGV >= 0) {
# Line 71 | Line 71 | while ($#ARGV >= 0) {
71   }
72   # Check that we're actually being asked to do something
73   die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
74 # Name our own persist file?
75 my $persistfile;
76 if ( $tensortree && $nproc > 1 && "$rtargs" !~ /-PP /) {
77        $persistfile = "$td/pfile.txt";
78        $rtargs = "-PP $persistfile $rtargs";
79 }
74   # Get scene description and dimensions
75   my $radscn = "$td/device.rad";
76   my $mgfscn = "$td/device.mgf";
# Line 114 | Line 108 | print
108   print "<!-- File produced by: genBSDF @savedARGV -->\n";
109   print
110   '<WindowElementType>System</WindowElementType>
111 + <FileType>BSDF</FileType>
112   <Optical>
113   <Layer>
114          <Material>
# Line 123 | Line 118 | print
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>Integral</DeviceType>\n";
121 > print "\t\t<DeviceType>Other</DeviceType>\n";
122 > print " </Material>\n";
123   # Output MGF description if requested
124   if ( $geout ) {
125 <        print "\t\t<Geometry format=\"MGF\" unit=\"$gunit\">\n";
125 >        print "\t<Geometry format=\"MGF\">\n";
126 >        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 $_; }
130          close MGFSCN;
131          print "xf\n";
132 <        print "\t\t</Geometry>\n";
132 >        print "</MGFblock>\n";
133 >        print "\t</Geometry>\n";
134   }
137 print " </Material>\n";
135   # Set up surface sampling
136   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + .5);
137   my $ny = int($nsamp/$nx + .5);
# Line 158 | Line 155 | exec("rm -rf $td");
155  
156   #-------------- End of main program segment --------------#
157  
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
158   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
159   sub do_tree_bsdf {
175 # Get sampling rate and subdivide task
176 my $ns2 = $ns;
177 $ns2 /= 2 if ( $tensortree == 3 );
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;
188 }
189 die "Script error 1" if ($pdiv[-1] != $ns2);
160   # Shirley-Chiu mapping from unit square to disk
161   $sq2disk = '
162   in_square_a = 2*in_square_x - 1;
# Line 229 | Line 199 | out_square_y = (out_square_b + 1)/2;
199   print "\t<DataDefinition>\n";
200   print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
201   print "\t</DataDefinition>\n";
202 < # Fork parallel rtcontrib processes to compute each side
203 < my $npleft = $nproc;
204 < if ( $doback ) {
205 <        for (my $splice = 0; $splice < $nsplice; $splice++) {
206 <                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 $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 < }
202 >
203 > # Start rcontrib processes for compute each side
204 > do_tree_rtcontrib(0) if ( $doback );
205 > do_tree_rtcontrib(1) if ( $doforw );
206 >
207   }       # end of sub do_tree_bsdf()
208  
209 < # Run rtcontrib process in background to generate tensor tree samples
210 < sub bg_tree_rtcontrib {
272 <        my $pid = fork();
273 <        die "Cannot fork new process" unless defined $pid;
274 <        if ($pid > 0) { return $pid; }
209 > # Run rcontrib process to generate tensor tree samples
210 > sub do_tree_rtcontrib {
211          my $forw = shift;
276        my $pn = shift;
277        my $pbeg = $pdiv[$pn];
278        my $plen = $pdiv[$pn+1] - $pbeg;
212          my $matargs = "-m $bmodnm";
213 <        if ( !$forw || !$doback ) { $matargs .= " -m $fmodnm"; }
214 <        my $cmd = "rtcontrib $rtargs -h -ff -fo -c $nsamp " .
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_" . sprintf("%03d", $pn) . ".flt $matargs $octree";
217 >                "-o $td/%s.flt $matargs $octree";
218          if ( $tensortree == 3 ) {
219                  # Isotropic BSDF
220 <                $cmd = "cnt $plen $ny $nx " .
221 <                        "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
222 <                        "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
223 <                        "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
224 <                        "-e 'Dx=1-2*($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
220 >                my $ns2 = $ns / 2;
221 >                $cmd = "cnt $ns2 $ny $nx " .
222 >                        "| rcalc -e 'r1=rand(.8681*recno-.673892)' " .
223 >                        "-e 'r2=rand(-5.37138*recno+67.1737811)' " .
224 >                        "-e 'r3=rand(+3.17603772*recno+83.766771)' " .
225 >                        "-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
226                          "-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
227                          "-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
228                          "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
# Line 299 | Line 233 | sub bg_tree_rtcontrib {
233                  # Anisotropic BSDF
234                  # Sample area vertically to improve load balance, since
235                  # shading systems usually have bilateral symmetry (L-R)
236 <                $cmd = "cnt $plen $ns $ny $nx " .
237 <                        "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
238 <                        "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
239 <                        "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
240 <                        "-e 'r4=rand(($pn-2.3857833)*recno-964.72738)' " .
241 <                        "-e 'in_square_x=($pbeg+\$1+r1)/$ns' " .
236 >                $cmd = "cnt $ns $ns $ny $nx " .
237 >                        "| rcalc -e 'r1=rand(.8681*recno-.673892)' " .
238 >                        "-e 'r2=rand(-5.37138*recno+67.1737811)' " .
239 >                        "-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]' " .
# Line 314 | Line 248 | sub bg_tree_rtcontrib {
248                          "| $cmd";
249          }
250   # print STDERR "Starting: $cmd\n";
251 <        exec($cmd);             # no return; status report to parent via wait
252 <        die "Cannot exec: $cmd\n";
253 < }       # end of bg_tree_rtcontrib()
251 >        system "$cmd" || die "Failure running rcontrib";
252 >        ttree_out($forw);
253 > }       # end of do_tree_rtcontrib()
254  
255   # Simplify and output tensor tree results
256   sub ttree_out {
257          my $forw = shift;
258          my $side = ("Back","Front")[$forw];
259          my $cmd;
260 < # Only output one transmitted distribution, preferring backwards
261 < if ( !$forw || !$doback ) {
260 > # Only output one transmitted anisotropic distribution, preferring backwards
261 > if ( !$forw || !$doback || $tensortree==3 ) {
262   print
263   '       <WavelengthData>
264                  <LayerNumber>System</LayerNumber>
# Line 332 | Line 266 | print
266                  <SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>
267                  <DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>
268                  <WavelengthDataBlock>
269 <                        <WavelengthDataDirection>Transmission</WavelengthDataDirection>
270 <                        <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
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 -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
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";
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; ) {
# Line 370 | Line 306 | print
306   print "\t\t\t<WavelengthDataDirection>Reflection $side</WavelengthDataDirection>\n";
307   print
308   '                       <AngleBasis>LBNL/Shirley-Chiu</AngleBasis>
309 <                        <ScatteringDataType>BRDF</ScatteringDataType>
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 " .
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";
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; ) {
# Line 448 | Line 384 | kbin2(pol,azi) = select(kfindrow(1, pol),
384   kbin = kbin2(Acos(abs(Dz)),Atan2(Dy,Dx));
385   ';
386   my $ndiv = 145;
387 < # Compute scattering data using rtcontrib
387 > # Compute scattering data using rcontrib
388   my @tfarr;
389   my @rfarr;
390   my @tbarr;
391   my @rbarr;
392   my $cmd;
393 < my $rtcmd = "rtcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
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' " .
# Line 471 | Line 407 | $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
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' " .
# Line 605 | Line 543 | print
543                          <WavelengthDataDirection>Reflection Front</WavelengthDataDirection>
544                          <ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
545                          <RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
546 <                        <ScatteringDataType>BRDF</ScatteringDataType>
546 >                        <ScatteringDataType>BTDF</ScatteringDataType>
547                          <ScatteringData>
548   ';
549   # Output front reflection (transposed order)
# Line 655 | Line 593 | print
593                          <WavelengthDataDirection>Reflection Back</WavelengthDataDirection>
594                          <ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>
595                          <RowAngleBasis>LBNL/Klems Full</RowAngleBasis>
596 <                        <ScatteringDataType>BRDF</ScatteringDataType>
596 >                        <ScatteringDataType>BTDF</ScatteringDataType>
597                          <ScatteringData>
598   ';
599   # Output back reflection (transposed order)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines