r16: finished adding separate configuration file

diff --git a/cgi-bin/ctsim.cgi b/cgi-bin/ctsim.cgi
index 89b05332236e7202b35115f6bc3ae112cf77718a..d81ee68fba76b9371ca92ab42ecb47a0a9a3911b 100644 (file)
--- a/cgi-bin/ctsim.cgi
+++ b/cgi-bin/ctsim.cgi
@@ -6,10 +6,10 @@ use CGI;
 use File::Basename;
 use Fcntl ':flock';
 
-require ctsim.conf;
+require './ctsim.conf';
 
 my $opt_d = 0;
-$ENV{'PATH'} = $bindir;
+$ENV{'PATH'} = $::bindir;
 
 my $fromhost = $ENV{'REMOTE_HOST'};
 
@@ -75,36 +75,36 @@ my $tmpid = $$;
 my $auto_window_img = "std0.1";
 my $auto_window_diff = "std1";
 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 $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 $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 $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";
 
@@ -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/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";
 
@@ -223,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";

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 8918f2eea48164be6b620df09cca963b02665402..ac31936d15c0bc42d68b9b54d0698e33fd9abfeb 100755 (executable)
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -6,10 +6,10 @@ use CGI;
 use File::Basename;
 use Fcntl ':flock';
 
-require ctsim.conf;
+require './ctsim.conf';
 
 my $opt_d = 0;
-$ENV{'PATH'} = $bindir;
+$ENV{'PATH'} = $::bindir;
 
 my $fromhost = $ENV{'REMOTE_HOST'};
 
@@ -75,36 +75,36 @@ my $tmpid = $$;
 my $auto_window_img = "std0.1";
 my $auto_window_diff = "std1";
 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 $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 $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 $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";
 
@@ -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/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";
 
@@ -223,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";