13 |
|
exit 1; |
14 |
|
} |
15 |
|
my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp); |
16 |
< |
my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz); |
17 |
< |
if ($windoz) { |
16 |
> |
my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph); |
17 |
> |
my ($curphase, $recovery); |
18 |
> |
if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) { |
19 |
> |
$td = $ARGV[1]; |
20 |
> |
open(MYAVH, "< $td/savedARGV.txt") or die "$td: invalid path\n"; |
21 |
> |
@ARGV = <MYAVH>; |
22 |
> |
close MYAVH; |
23 |
> |
chomp @ARGV; |
24 |
> |
$recovery = 0; |
25 |
> |
if (open(MYPH, "< $td/phase.txt")) { |
26 |
> |
while (<MYPH>) { |
27 |
> |
chomp($recovery = $_); |
28 |
> |
} |
29 |
> |
close MYPH; |
30 |
> |
} |
31 |
> |
} elsif ($windoz) { |
32 |
|
my $tmploc = `echo \%TMP\%`; |
33 |
< |
chomp($tmploc); |
33 |
> |
chomp $tmploc; |
34 |
|
$td = mkdtemp("$tmploc\\genBSDF.XXXXXX"); |
35 |
+ |
} else { |
36 |
+ |
$td = mkdtemp("/tmp/genBSDF.XXXXXX"); |
37 |
+ |
chomp $td; |
38 |
+ |
} |
39 |
+ |
if ($windoz) { |
40 |
|
$radscn = "$td\\device.rad"; |
41 |
|
$mgfscn = "$td\\device.mgf"; |
42 |
|
$octree = "$td\\device.oct"; |
57 |
|
$rfz = "$td\\rfz.dat"; |
58 |
|
$tbz = "$td\\tbz.dat"; |
59 |
|
$rbz = "$td\\rbz.dat"; |
60 |
< |
chomp $td; |
61 |
< |
$rmtmp = "rmdir /S /Q $td"; |
60 |
> |
$cph = "$td\\phase.txt"; |
61 |
> |
$rmtmp = "rd /S /Q $td"; |
62 |
|
} else { |
44 |
– |
$td = mkdtemp("/tmp/genBSDF.XXXXXX"); |
45 |
– |
chomp $td; |
63 |
|
$radscn = "$td/device.rad"; |
64 |
|
$mgfscn = "$td/device.mgf"; |
65 |
|
$octree = "$td/device.oct"; |
80 |
|
$rfz = "$td/rfz.dat"; |
81 |
|
$tbz = "$td/tbz.dat"; |
82 |
|
$rbz = "$td/rbz.dat"; |
83 |
+ |
$cph = "$td/phase.txt"; |
84 |
|
$rmtmp = "rm -rf $td"; |
85 |
|
} |
86 |
|
my @savedARGV = @ARGV; |
154 |
|
} |
155 |
|
# Check that we're actually being asked to do something |
156 |
|
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)); |
157 |
|
$wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c"; |
158 |
|
$wrapper .= " -u $gunit"; |
159 |
< |
# Get scene description and dimensions |
160 |
< |
if ( $mgfin ) { |
161 |
< |
system "mgf2rad @ARGV > $radscn"; |
162 |
< |
die "Could not load MGF input\n" if ( $? ); |
163 |
< |
} else { |
149 |
< |
system "xform -e @ARGV > $radscn"; |
150 |
< |
die "Could not load Radiance input\n" if ( $? ); |
151 |
< |
} |
152 |
< |
if ($#dim != 5) { |
153 |
< |
@dim = split ' ', `getbbox -h $radscn`; |
154 |
< |
} |
155 |
< |
print STDERR "Warning: Device extends into room\n" if ($dim[5] > 1e-5); |
156 |
< |
$wrapper .= ' -f "t=' . ($dim[5] - $dim[4]) . ';w=' . ($dim[1] - $dim[0]) . |
157 |
< |
';h=' . ($dim[3] - $dim[2]) . '"'; |
158 |
< |
# Generate octree |
159 |
< |
system "oconv -w $radscn > $octree"; |
160 |
< |
die "Could not compile scene\n" if ( $? ); |
161 |
< |
# Add MGF description if requested |
162 |
< |
if ( $geout ) { |
163 |
< |
open(MGFSCN, "> $mgfscn"); |
164 |
< |
printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2; |
165 |
< |
close MGFSCN; |
159 |
> |
if ( !defined $recovery ) { |
160 |
> |
# Issue warning for unhandled reciprocity case |
161 |
> |
print STDERR "Warning: recommend both +forward and +backward with -t3\n" if |
162 |
> |
($tensortree==3 && !($doforw && $doback)); |
163 |
> |
# Get scene description |
164 |
|
if ( $mgfin ) { |
165 |
< |
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}; |
165 |
> |
system "mgf2rad @ARGV > $radscn"; |
166 |
> |
die "Could not load MGF input\n" if ( $? ); |
167 |
|
} else { |
168 |
< |
system "rad2mgf $radscn >> $mgfscn"; |
168 |
> |
system "xform -e @ARGV > $radscn"; |
169 |
> |
die "Could not load Radiance input\n" if ( $? ); |
170 |
|
} |
171 |
– |
open(MGFSCN, ">> $mgfscn"); |
172 |
– |
print MGFSCN "xf\n"; |
173 |
– |
close MGFSCN; |
174 |
– |
$wrapper .= " -g $mgfscn"; |
171 |
|
} |
172 |
< |
# Create receiver & sender surfaces (rectangular) |
173 |
< |
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 |
< |
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; |
172 |
> |
if ( $#dim != 5 ) { |
173 |
> |
@dim = split ' ', `getbbox -h $radscn`; |
174 |
|
} |
175 |
+ |
die "Device entirely inside room!\n" if ( $dim[4] >= 0 ); |
176 |
+ |
if ( $dim[5] > 1e-5 ) { |
177 |
+ |
print STDERR "Warning: Device extends into room\n"; |
178 |
+ |
} elsif ( $dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2]) ) { |
179 |
+ |
print STDERR "Warning: Device far behind Z==0 plane\n"; |
180 |
+ |
} |
181 |
+ |
# Assume Zmax==0 to derive thickness so pkgBSDF will work |
182 |
+ |
$wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) . |
183 |
+ |
';h=' . ($dim[3] - $dim[2]) . '"'; |
184 |
+ |
$wrapper .= " -g $mgfscn" if ( $geout ); |
185 |
|
# Calculate CIE (u',v') from Radiance RGB: |
186 |
|
my $CIEuv = 'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' . |
187 |
|
'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' . |
188 |
|
'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' . |
189 |
|
'den=Xi+15*Yi+3*Zi;' . |
190 |
|
'uprime=4*Xi/den;vprime=9*Yi/den;' ; |
191 |
+ |
my $FEPS = 1e-5; |
192 |
+ |
my $ns = 2**$ttlog2; |
193 |
+ |
my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1); |
194 |
+ |
my $ny = int($nsamp/$nx + 1); |
195 |
+ |
$nsamp = $nx * $ny; |
196 |
+ |
$rfluxmtx .= " -n $nproc -c $nsamp"; |
197 |
+ |
if ( !defined $recovery ) { |
198 |
+ |
open(MYAVH, "> $td/savedARGV.txt"); |
199 |
+ |
foreach (@savedARGV) { |
200 |
+ |
print MYAVH "$_\n"; |
201 |
+ |
} |
202 |
+ |
close MYAVH; |
203 |
+ |
# Generate octree |
204 |
+ |
system "oconv -w $radscn > $octree"; |
205 |
+ |
die "Could not compile scene\n" if ( $? ); |
206 |
+ |
# Add MGF description if requested |
207 |
+ |
if ( $geout ) { |
208 |
+ |
open(MGFSCN, "> $mgfscn"); |
209 |
+ |
printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2; |
210 |
+ |
close MGFSCN; |
211 |
+ |
if ( $mgfin ) { |
212 |
+ |
system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn}; |
213 |
+ |
} else { |
214 |
+ |
system "rad2mgf $radscn >> $mgfscn"; |
215 |
+ |
} |
216 |
+ |
open(MGFSCN, ">> $mgfscn"); |
217 |
+ |
print MGFSCN "xf\n"; |
218 |
+ |
close MGFSCN; |
219 |
+ |
} |
220 |
+ |
# Create receiver & sender surfaces (rectangular) |
221 |
+ |
open(RADSCN, "> $receivers"); |
222 |
+ |
print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n"); |
223 |
+ |
print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n"; |
224 |
+ |
print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n"; |
225 |
+ |
print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n"; |
226 |
+ |
print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n"); |
227 |
+ |
print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n"; |
228 |
+ |
print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n"; |
229 |
+ |
print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n"; |
230 |
+ |
close RADSCN; |
231 |
+ |
# Prepare sender surfaces |
232 |
+ |
if ( $tensortree != 3 ) { # Isotropic tensor tree is exception |
233 |
+ |
open (RADSCN, "> $fsender"); |
234 |
+ |
print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n"); |
235 |
+ |
print RADSCN "void polygon fwd_sender\n0\n0\n12\n"; |
236 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS; |
237 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS; |
238 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS; |
239 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS; |
240 |
+ |
close RADSCN; |
241 |
+ |
open (RADSCN, "> $bsender"); |
242 |
+ |
print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n"); |
243 |
+ |
print RADSCN "void polygon bwd_sender\n0\n0\n12\n"; |
244 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS; |
245 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS; |
246 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS; |
247 |
+ |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS; |
248 |
+ |
close RADSCN; |
249 |
+ |
} |
250 |
+ |
print STDERR "Recover using: $0 -recover $td\n"; |
251 |
+ |
} |
252 |
+ |
# Open unbuffered progress file |
253 |
+ |
open(MYPH, ">> $td/phase.txt"); |
254 |
+ |
{ |
255 |
+ |
my $ofh = select MYPH; |
256 |
+ |
$| = 1; |
257 |
+ |
select $ofh; |
258 |
+ |
} |
259 |
+ |
$curphase = 0; |
260 |
|
# Create data segments (all the work happens here) |
261 |
|
if ( $tensortree ) { |
262 |
|
do_tree_bsdf(); |
270 |
|
# Clean up temporary files and exit |
271 |
|
exec $rmtmp; |
272 |
|
|
273 |
< |
#-------------- End of main program segment --------------# |
273 |
> |
#============== End of main program segment ==============# |
274 |
|
|
275 |
+ |
# Function to determine if next phase should be skipped or recovered |
276 |
+ |
sub do_phase { |
277 |
+ |
$curphase++; |
278 |
+ |
if ( defined $recovery ) { |
279 |
+ |
if ( $recovery > $curphase ) { return 0; } |
280 |
+ |
if ( $recovery == $curphase ) { return -1; } |
281 |
+ |
} |
282 |
+ |
print MYPH "$curphase\n"; |
283 |
+ |
return 1; |
284 |
+ |
} |
285 |
+ |
|
286 |
+ |
# Check if we are in active phase (not skipping parts) |
287 |
+ |
sub active_phase { |
288 |
+ |
if ( defined $recovery ) { |
289 |
+ |
if ( $recovery > $curphase ) { return 0; } |
290 |
+ |
if ( $recovery == $curphase ) { return -1; } |
291 |
+ |
} |
292 |
+ |
return 1; |
293 |
+ |
} |
294 |
+ |
|
295 |
+ |
# Function to run program and check output if in active phase |
296 |
+ |
sub run_check { |
297 |
+ |
if ( !active_phase() ) { return; } |
298 |
+ |
my $cmd = shift; |
299 |
+ |
# print STDERR "Running: $cmd\n"; |
300 |
+ |
system $cmd; |
301 |
+ |
die "Failure running: $cmd\n" if ( $? ); |
302 |
+ |
} |
303 |
+ |
|
304 |
|
#++++++++++++++ Tensor tree BSDF generation ++++++++++++++# |
305 |
|
sub do_tree_bsdf { |
306 |
|
|
313 |
|
# Call rfluxmtx and process tensor tree BSDF for the given direction |
314 |
|
sub do_ttree_dir { |
315 |
|
my $forw = shift; |
316 |
+ |
my $dop = do_phase(); |
317 |
+ |
my $r = ($dop < 0) ? " -r" : ""; |
318 |
|
my $cmd; |
319 |
|
if ( $tensortree == 3 ) { |
320 |
|
# Isotropic BSDF |
330 |
|
qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } . |
331 |
|
qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } . |
332 |
|
qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } . |
333 |
< |
"| $rfluxmtx -fa -y $ns2 - $receivers -i $octree"; |
333 |
> |
"| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree"; |
334 |
|
} else { |
335 |
|
$cmd = "cnt $ns2 $ny $nx " . |
336 |
|
qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } . |
342 |
|
qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } . |
343 |
|
qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } . |
344 |
|
qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } . |
345 |
< |
"| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree"; |
345 |
> |
"| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree"; |
346 |
|
} |
347 |
|
} else { |
348 |
|
# Anisotropic BSDF |
349 |
|
my $sender = ($bsender,$fsender)[$forw]; |
350 |
|
if ($windoz) { |
351 |
< |
$cmd = "$rfluxmtx -fa $sender $receivers -i $octree"; |
351 |
> |
$cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree"; |
352 |
|
} else { |
353 |
< |
$cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree"; |
353 |
> |
$cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree"; |
354 |
|
} |
355 |
|
} |
356 |
< |
# print STDERR "Starting: $cmd\n"; |
357 |
< |
system $cmd; |
358 |
< |
die "Failure running rfluxmtx" if ( $? ); |
356 |
> |
if ( $dop ) { |
357 |
> |
# print STDERR "Running: $cmd\n"; |
358 |
> |
system $cmd; |
359 |
> |
die "Failure running rfluxmtx" if ( $? ); |
360 |
> |
} |
361 |
|
ttree_out($forw); |
362 |
|
} # end of do_ttree_dir() |
363 |
|
|
440 |
|
$cmd .= " -of $src " . |
441 |
|
"| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2"; |
442 |
|
} |
443 |
< |
# print STDERR "Running: $cmd\n"; |
369 |
< |
system "$cmd > $dest"; |
370 |
< |
die "Failure running rttree_reduce" if ( $? ); |
443 |
> |
run_check "$cmd > $dest"; |
444 |
|
} else { |
445 |
|
if ($windoz) { |
446 |
|
$cmd = "rcollate -ho -oc 1 $src | " . $cmd ; |
447 |
|
} else { |
448 |
|
$cmd .= " $src"; |
449 |
|
} |
450 |
< |
open(DATOUT, "> $dest"); |
451 |
< |
print DATOUT "{\n"; |
452 |
< |
close DATOUT; |
453 |
< |
# print STDERR "Running: $cmd\n"; |
454 |
< |
system "$cmd >> $dest"; |
455 |
< |
die "Failure running rcalc" if ( $? ); |
456 |
< |
open(DATOUT, ">> $dest"); |
457 |
< |
for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) { |
458 |
< |
print DATOUT "0\n"; |
450 |
> |
if ( active_phase() ) { |
451 |
> |
open(DATOUT, "> $dest"); |
452 |
> |
print DATOUT "{\n"; |
453 |
> |
close DATOUT; |
454 |
> |
# print STDERR "Running: $cmd\n"; |
455 |
> |
system "$cmd >> $dest"; |
456 |
> |
die "Failure running rcalc" if ( $? ); |
457 |
> |
open(DATOUT, ">> $dest"); |
458 |
> |
for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) { |
459 |
> |
print DATOUT "0\n"; |
460 |
> |
} |
461 |
> |
print DATOUT "}\n"; |
462 |
> |
close DATOUT; |
463 |
|
} |
387 |
– |
print DATOUT "}\n"; |
388 |
– |
close DATOUT; |
464 |
|
} |
465 |
|
if ( "$spec" ne "$curspec" ) { |
466 |
|
$wrapper .= " -s $spec"; |
483 |
|
# Call rfluxmtx and process tensor tree BSDF for the given direction |
484 |
|
sub do_matrix_dir { |
485 |
|
my $forw = shift; |
486 |
< |
my $cmd; |
486 |
> |
my $dop = do_phase(); |
487 |
> |
my $r = ($dop < 0) ? " -r" : ""; |
488 |
|
my $sender = ($bsender,$fsender)[$forw]; |
489 |
< |
$cmd = "$rfluxmtx -fd $sender $receivers -i $octree"; |
490 |
< |
# print STDERR "Starting: $cmd\n"; |
491 |
< |
system $cmd; |
492 |
< |
die "Failure running rfluxmtx" if ( $? ); |
489 |
> |
my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree"; |
490 |
> |
if ( $dop ) { |
491 |
> |
# print STDERR "Running: $cmd\n"; |
492 |
> |
system $cmd; |
493 |
> |
die "Failure running rfluxmtx" if ( $? ); |
494 |
> |
} |
495 |
|
matrix_out($forw); |
496 |
|
} # end of do_matrix_dir() |
497 |
|
|
536 |
|
$cmd .= " -c 0.0241 0.1229 0.8530"; |
537 |
|
} |
538 |
|
$cmd .= " $src | rcollate -ho -oc 145"; |
539 |
< |
# print STDERR "Running: $cmd\n"; |
462 |
< |
system "$cmd > $dest"; |
463 |
< |
die "Failure running rmtxop" if ( $? ); |
539 |
> |
run_check "$cmd > $dest"; |
540 |
|
if ( "$spec" ne "$curspec" ) { |
541 |
|
$wrapper .= " -s $spec"; |
542 |
|
$curspec = $spec; |