X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=inline;f=cgi-bin%2Fctsim.cgi.in;h=ac31936d15c0bc42d68b9b54d0698e33fd9abfeb;hb=e2dbd11ba1c5f0535d2f73c83e95c9c2ebef5318;hp=c4d9e531b39dadb4f4a560c7b5d1119af9b97bda;hpb=13838bda88b63a2535b5baaf7197006767de4b8e;p=ctsim.git
diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index c4d9e53..ac31936 100755
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -6,9 +6,10 @@ use CGI;
use File::Basename;
use Fcntl ':flock';
+require './ctsim.conf';
+
my $opt_d = 0;
-my $bindir = "@prefix@/bin";
-$ENV{'PATH'} = $bindir;
+$ENV{'PATH'} = $::bindir;
my $fromhost = $ENV{'REMOTE_HOST'};
@@ -70,44 +71,41 @@ $error .= "IR Nx and Ny must be between 5 and 1024
" if ($IR_Nx < 5 || $IR_Nx
$error .= "IR Filter Parameter must be between 0 and 1
" if ($IR_Filter_Param < 0 || $IR_Filter_Param > 1);
-my $jobdir = "@webdatadir@";
my $tmpid = $$;
my $auto_window_img = "std0.1";
my $auto_window_diff = "std1";
my $auto_window_rs = "full";
-my $datadir = "@webdatadir@";
-my $url_datadir = "@webdataurl@";
-my $logfile = "$jobdir/ctsim.log";
-
-my $result_fname = "$datadir/result-$tmpid.html";
-my $phantom_fname = "$datadir/phantom-$tmpid.sdf";
-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 $phantom_png = "$datadir/phantom-$tmpid.png";
-my $ir_png = "$datadir/ir-$tmpid.png";
-my $rs_png = "$datadir/rs-$tmpid.png";
-my $diff_png = "$datadir/diff-$tmpid.png";
-
-my $result_url = "$url_datadir/result-$tmpid.html";
-my $phantom_png_url = "$url_datadir/phantom-$tmpid.png";
-my $ir_png_url = "$url_datadir/ir-$tmpid.png";
-my $rs_png_url = "$url_datadir/rs-$tmpid.png";
-my $diff_png_url = "$url_datadir/diff-$tmpid.png";
-
-my $ir_ver = "$bindir/ir";
-my $rs_ver = "$bindir/rs";
-my $gp_ver = "$bindir/gp";
-my $diff_ver = "$bindir/sdf-2";
-$ir_ver = "/opt/lam/bin/mpirun N N $bindir/ir-mpi" if $MPI;
-$rs_ver = "/opt/lam/bin/mpirun N N $bindir/rs-mpi" if $MPI;
-$gp_ver = "/opt/lam/bin/mpirun N N $bindir/gp-mpi" if $MPI;
-
-my $gp_cmd = "$gp_ver $phantom_fname $Phantom_Nx $Phantom_Ny --phantom $Phantom_Name --nsample $Phantom_NSample";
-my $rs_cmd = "$rs_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 $ir_cmd = "$ir_ver $rs_fname $ir_fname $IR_Nx $IR_Ny --filter $IR_Filter --filter-param $IR_Filter_Param --interp $IR_Interp --backproj $IR_Backproj";
+my $logfile = "$::jobdir/ctsim.log";
+
+my $result_fname = "$::datadir/result-$tmpid.html";
+my $phantom_fname = "$::datadir/phantom-$tmpid.sdf";
+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 $phantom_png = "$::datadir/phantom-$tmpid.png";
+my $ir_png = "$::datadir/ir-$tmpid.png";
+my $rs_png = "$::datadir/rs-$tmpid.png";
+my $diff_png = "$::datadir/diff-$tmpid.png";
+
+my $result_url = "$::url_datadir/result-$tmpid.html";
+my $phantom_png_url = "$::url_datadir/phantom-$tmpid.png";
+my $ir_png_url = "$::url_datadir/ir-$tmpid.png";
+my $rs_png_url = "$::url_datadir/rs-$tmpid.png";
+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 $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";
+my $rs_sdf_cmd = "$::bindir/rs2sdf $rs_fname $rs_sdf_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";
my $window_options = "--auto $auto_window_img";
@@ -118,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/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 $title = "CT Simulation Results";
@@ -225,7 +223,7 @@ else
print "Content-type: text/plain\n\n";
print "The simulator was unable to create an result file.\n";
}
-if (open(JOBFILES,"> $jobdir/$tmpid"))
+if (open(JOBFILES,"> $::jobdir/$tmpid"))
{
flock(JOBFILES,LOCK_EX);
print JOBFILES "gmt_start=$gmt_start\n";