X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=6b0da4833601b1a57a6bf13482e72ddb62430a0f;hb=2ab37d1cdf6caa543510f370cbeb3749d0d61fe0;hp=60b4bb0b160a1e1034bf6f6b280614b5d875825a;hpb=0672fef661f75b412c2fd59c22ea7b24fdef6526;p=ctsim.git
diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 60b4bb0..6b0da48 100755
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -9,7 +9,7 @@ use Fcntl ':flock';
require './ctsim.conf';
my $opt_d = 0;
-$ENV{'PATH'} = $::bindir;
+$ENV{'PATH'} = "$::bindir:$::lamrundir";
my $fromhost = $ENV{'REMOTE_HOST'};
@@ -56,11 +56,11 @@ my $Disp_Min = "auto";
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')
";
+if ($Disp_Min ne 'auto' && ! ($Disp_Min =~ /^[\d\.\-]+$/)) {
+ $error .= "Display Minimum must be 'auto' or numeric (received $Disp_Min)
";
}
-if ($Disp_Max ne 'auto' && ! ($Disp_Max =~ /^[\d\.]+$/)) {
- $error .= "Display Maximum must be 'auto' or numeric (received '$Disp_Max')
";
+if ($Disp_Max ne 'auto' && ! ($Disp_Max =~ /^[\d\.\-]+$/)) {
+ $error .= "Display Maximum must be 'auto' or numeric (received $Disp_Max)
";
}
my $MPI_Str = FilterMetaChars($in{'MPI'});
@@ -78,11 +78,11 @@ my $auto_window_rs = "full";
my $logfile = "$::jobdir/ctsim.log";
my $result_fname = "$::datadir/result-$tmpid.html";
-my $phantom_fname = "$::datadir/phantom-$tmpid.sdf";
+my $phantom_fname = "$::datadir/phantom-$tmpid.if";
my $rs_fname = "$::datadir/rs-$tmpid.rs";
-my $ir_fname = "$::datadir/ir-$tmpid.sdf";
-my $rs_sdf_fname = "$::datadir/rs-$tmpid.sdf";
-my $diff_fname = "$::datadir/diff-$tmpid.sdf";
+my $ir_fname = "$::datadir/ir-$tmpid.if";
+my $rs_if_fname = "$::datadir/rs-$tmpid.if";
+my $diff_fname = "$::datadir/diff-$tmpid.if";
my $phantom_png = "$::datadir/phantom-$tmpid.png";
my $ir_png = "$::datadir/ir-$tmpid.png";
my $rs_png = "$::datadir/rs-$tmpid.png";
@@ -96,15 +96,15 @@ my $diff_png_url = "$::url_datadir/diff-$tmpid.png";
my $ctrec_ver = "$::bindir/ctrec";
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;
+my $phm2if_ver = "$::bindir/phm2if";
+my $diff_ver = "$::bindir/if-2";
+$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;
+$phm2if_ver = "/opt/lam/bin/mpirun N N $::lamrundir/phm2if-lam" if $MPI;
-my $gp_cmd = "$phm2sdf_ver $phantom_fname $Phantom_Nx $Phantom_Ny --phantom $Phantom_Name --nsample $Phantom_NSample";
+my $gp_cmd = "$phm2if_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";
-my $rs_sdf_cmd = "$::bindir/rs2sdf $rs_fname $rs_sdf_fname";
+my $rs_if_cmd = "$::bindir/rs2if $rs_fname $rs_if_fname";
my $ir_cmd = "$ctrec_ver $rs_fname $ir_fname $IR_Nx $IR_Ny --filter $IR_Filter --filter-param $IR_Filter_Param --interp $IR_Interp --backproj $IR_Backproj";
my $diff_cmd = "$diff_ver $phantom_fname $ir_fname $diff_fname --comp";
@@ -116,10 +116,10 @@ if ($Disp_Max ne 'auto') {
$window_options .= " --max $Disp_Max";
}
-my $png1_cmd = "$::bindir/sdf2img $phantom_fname $phantom_png $window_options --stats --format png";
-my $png2_cmd = "$::bindir/sdf2img $ir_fname $ir_png $window_options --stats --format png";
-my $png3_cmd = "$::bindir/sdf2img $rs_sdf_fname $rs_png --auto $auto_window_rs --stats --format png";
-my $png4_cmd = "$::bindir/sdf2img $diff_fname $diff_png --auto $auto_window_diff --stats --format png";
+my $png1_cmd = "$::bindir/if2img $phantom_fname $phantom_png $window_options --stats --format png";
+my $png2_cmd = "$::bindir/if2img $ir_fname $ir_png $window_options --stats --format png";
+my $png3_cmd = "$::bindir/if2img $rs_if_fname $rs_png --auto $auto_window_rs --stats --format png";
+my $png4_cmd = "$::bindir/if2img $diff_fname $diff_png --auto $auto_window_diff --stats --format png";
my $title = "CT Simulation Results";
@@ -130,7 +130,7 @@ $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 |