require './ctsim.conf';
my $opt_d = 0;
-$ENV{'PATH'} = $::bindir;
+$ENV{'PATH'} = "$::bindir:$::lamrundir";
my $fromhost = $ENV{'REMOTE_HOST'};
my $Disp_Max = "auto";
$Disp_Min = FilterToNumber($in{'Disp_Min'}) if ($in{'Disp_Min'} ne "auto" && $in{'Disp_Min'} ne "");
$Disp_Max = FilterToNumber($in{'Disp_Max'}) if ($in{'Disp_Max'} ne "auto" && $in{'Disp_Max'} ne "");
-if ($Disp_Min ne 'auto' && ! ($Disp_Min =~ /^[\d\.]+$/)) {
- $error .= "Display Minimum must be 'auto' or numeric (received '$Disp_Min') <br>";
+if ($Disp_Min ne 'auto' && ! ($Disp_Min =~ /^[\d\.\-]+$/)) {
+ $error .= "Display Minimum must be 'auto' or numeric (received $Disp_Min) <br>";
}
-if ($Disp_Max ne 'auto' && ! ($Disp_Max =~ /^[\d\.]+$/)) {
- $error .= "Display Maximum must be 'auto' or numeric (received '$Disp_Max') <br>";
+if ($Disp_Max ne 'auto' && ! ($Disp_Max =~ /^[\d\.\-]+$/)) {
+ $error .= "Display Maximum must be 'auto' or numeric (received $Disp_Max) <br>";
}
my $MPI_Str = FilterMetaChars($in{'MPI'});
my $phm2rs_ver = "$::bindir/phm2rs";
my $phm2sdf_ver = "$::bindir/phm2sdf";
my $diff_ver = "$::bindir/sdf-2";
-$ctrec_ver = "/opt/lam/bin/mpirun N N $::bindir/ctrec-lam" if $MPI;
-$phm2rs_ver = "/opt/lam/bin/mpirun N N $::bindir/phm2rs-lam" if $MPI;
-$phm2sdf_ver = "/opt/lam/bin/mpirun N N $::bindir/phm2sdf-lam" if $MPI;
+$ctrec_ver = "/opt/lam/bin/mpirun N N $::lamrundir/ctrec-lam" if $MPI;
+$phm2rs_ver = "/opt/lam/bin/mpirun N N $::lamrundir/phm2rs-lam" if $MPI;
+$phm2sdf_ver = "/opt/lam/bin/mpirun N N $::lamrundir/phm2sdf-lam" if $MPI;
my $gp_cmd = "$phm2sdf_ver $phantom_fname $Phantom_Nx $Phantom_Ny --phantom $Phantom_Name --nsample $Phantom_NSample";
my $rs_cmd = "$phm2rs_ver $rs_fname $RS_NDet $RS_NRot --phantom $Phantom_Name --nray $RS_NRay --rotangle $RS_RotAngle";
$out .= "Please correct them and try submitting your request again.</FONT><br>\n";
$out .= "<i>$error</i>";
} 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 .= "<H3>Command Output</H3>$cmdout<HR>\n";
+ }
}
- my $png_gp_out_html = $png_gp_out;
- my $png_ir_out_html = $png_ir_out;
- my $png_rs_out_html = $png_rs_out;
- my $png_diff_out_html = $png_diff_out;
- $png_gp_out_html =~ s/\n/<br>/gms;
- $png_ir_out_html =~ s/\n/<br>/gms;
- $png_rs_out_html =~ s/\n/<br>/gms;
- $png_diff_out_html =~ s/\n/<br>/gms;
- $out .= "<TABLE><TR><TD>Phantom Image</TD><TD>Reconstructed Image</TD></TR>\n";
- $out .= "<TR><TD><IMG SRC=\"$phantom_png_url\"><br><FONT SIZE=1>$png_gp_out</FONT></TD>\n";
- $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_ir_out</FONT></TD></TR>\n";
- $out .= "<TR><TD>Raysum Sinusoid</TD><TD>Phantom/Reconst Error</TD></TR>\n";
- $out .= "<TR><TD><IMG SRC=\"$rs_png_url\"><br><FONT SIZE=1>$png_rs_out</FONT></TD>\n";
- $out .= "<TD><IMG SRC=\"$diff_png_url\"><br><FONT SIZE=2>$diff_out</FONT><br><FONT SIZE=1>$png_diff_out</FONT></TD></TR>\n";
- $out .= "</TABLE>";
- $out .= "Execution time: $execution_time seconds\n";
+ }
+
+ $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 .= "<H3>Command Output</H3>$cmdout<HR>\n";
+ }
+ my $png_gp_out_html = $png_gp_out;
+ my $png_ir_out_html = $png_ir_out;
+ my $png_rs_out_html = $png_rs_out;
+ my $png_diff_out_html = $png_diff_out;
+ $png_gp_out_html =~ s/\n/<br>/gms;
+ $png_ir_out_html =~ s/\n/<br>/gms;
+ $png_rs_out_html =~ s/\n/<br>/gms;
+ $png_diff_out_html =~ s/\n/<br>/gms;
+ $out .= "<TABLE><TR><TD>Phantom Image</TD><TD>Reconstructed Image</TD></TR>\n";
+ $out .= "<TR><TD><IMG SRC=\"$phantom_png_url\"><br><FONT SIZE=1>$png_gp_out</FONT></TD>\n";
+ $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_ir_out</FONT></TD></TR>\n";
+ $out .= "<TR><TD>Raysum Sinusoid</TD><TD>Phantom/Reconst Error</TD></TR>\n";
+ $out .= "<TR><TD><IMG SRC=\"$rs_png_url\"><br><FONT SIZE=1>$png_rs_out</FONT></TD>\n";
+ $out .= "<TD><IMG SRC=\"$diff_png_url\"><br><FONT SIZE=2>$diff_out</FONT><br><FONT SIZE=1>$png_diff_out</FONT></TD></TR>\n";
+ $out .= "</TABLE>";
+ $out .= "Execution time: $execution_time seconds\n";
}
$out .= "<HR>\n";
sub FilterToNumber
{
my $var = pop(@_);
- $var =~ /^(\d*\.*\d*)$/;
+ $var =~ /^(\-*\d*\.*\d*)$/;
$1;
}