X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=660ac60b504445ad9182d9db2427424b2b6030c4;hp=4a2824ffeabf3c37991c6b1db235a7bd967636b5;hb=ba39c5a65a2aeeb695b1434b1d7cb781d110c1b2;hpb=35bc3e7cef4318d9a43344b651f751ee128202d2
diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 4a2824f..660ac60 100755
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -140,68 +140,62 @@ if ($error ne "") {
$out .= "Please correct them and try submitting your request again.
\n";
$out .= "$error";
} else {
- my $gp_out;
- my $rs_out;
- my $rs_sdf_out;
- my $ir_out;
- my $diff_out;
- my $png_gp_out;
- my $png_ir_out;
- my $png_rs_out;
- my $png_diff_out;
- if (1) {
- $gp_out = `$gp_cmd`;
- $rs_out .= `$rs_cmd`;
- $rs_sdf_out .= `$rs_sdf_cmd`;
- $ir_out .= `$ir_cmd`;
- $diff_out .= `$diff_cmd`;
- $png_gp_out .= `$png1_cmd`;
+ my $gp_out;
+ my $rs_out;
+ my $rs_sdf_out;
+ my $ir_out;
+ my $diff_out;
+ my $png_gp_out;
+ my $png_ir_out;
+ my $png_rs_out;
+ my $png_diff_out;
+ $gp_out = `$gp_cmd`;
+ if (-s $phantom_fname) {
+ $rs_out .= `$rs_cmd`;
+ $png_gp_out .= `$png1_cmd`;
+ if (-s $rs_fname) {
+ $rs_sdf_out .= `$rs_sdf_cmd`;
+ $png_rs_out .= `$png3_cmd`;
+ $ir_out .= `$ir_cmd`;
+ if (-s $ir_fname) {
$png_ir_out .= `$png2_cmd`;
- $png_rs_out .= `$png3_cmd`;
+ $diff_out .= `$diff_cmd`;
$png_diff_out .= `$png4_cmd`;
- } else {
- $gp_out = `$gp_cmd 2>&1`;
- $rs_out .= `$rs_cmd 2>&1`;
- $rs_sdf_out .= `$rs_sdf_cmd 2>&1`;
- $ir_out .= `$ir_cmd 2>&1`;
- $diff_out .= `$diff_cmd 2>&1`;
- $png_gp_out .= `$png1_cmd 2>&1`;
- $png_ir_out .= `$png2_cmd 2>&1`;
- $png_rs_out .= `$png3_cmd 2>&1`;
- $png_diff_out .= `$png4_cmd 2>&1`;
- }
- $cmdout = "$gp_cmd\n $gp_out $rs_cmd\n $rs_out $rs_sdf_cmd\n $rs_sdf_out $ir_cmd\n $ir_out $diff_cmd\n $diff_out $png1_cmd\n $png_gp_out $png2_cmd\n $png_ir_out $png3_cmd\n $png_rs_out $png4_cmd\n $png_diff_out";
- if (open(LOGFILE,">> $logfile")) {
- flock(LOGFILE,LOCK_EX);
- seek(LOGFILE, 0, 2);
- print LOGFILE "Job $tmpid\n";
- print LOGFILE $cmdout;
- print LOGFILE "----------------------------------------------------\n";
- flock(LOGFILE,LOCK_UN);
- close(LOGFILE);
- }
- $gmt_end = time();
- $execution_time = $gmt_end - $gmt_start;
- if ($opt_d)
- {
- $out .= "
Phantom Image | Reconstructed Image |
$png_gp_out | \n";
- $out .= "$png_ir_out |
Raysum Sinusoid | Phantom/Reconst Error |
$png_rs_out | \n";
- $out .= "$diff_out $png_diff_out |
Phantom Image | Reconstructed Image |
$png_gp_out | \n";
+ $out .= "$png_ir_out |
Raysum Sinusoid | Phantom/Reconst Error |
$png_rs_out | \n";
+ $out .= "$diff_out $png_diff_out |