r12: modified to use separate configuration file

[ctsim.git] / cgi-bin / ctsim.cgi.in

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index c4d9e531b39dadb4f4a560c7b5d1119af9b97bda..8918f2eea48164be6b620df09cca963b02665402 100755 (executable)
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -6,8 +6,9 @@ use CGI;
 use File::Basename;
 use Fcntl ':flock';
 
+require ctsim.conf;
+
 my $opt_d = 0;
-my $bindir = "@prefix@/bin";
 $ENV{'PATH'} = $bindir;
 
 my $fromhost = $ENV{'REMOTE_HOST'};
@@ -70,13 +71,10 @@ $error .= "IR Nx and Ny must be between 5 and 1024<br>" if ($IR_Nx < 5 || $IR_Nx
 $error .= "IR Filter Parameter must be between 0 and 1<br>" 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";
@@ -96,18 +94,18 @@ 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 $ctrec_ver = "$bindir/ctrec";
+my $phm2rs_ver = "$bindir/phm2rs";
+my $phm2sdf_ver = "$bindir/phm2sdf";
 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;
+$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 = "$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 $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 = "$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 $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";