r54: Fixed --phantom error

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 3ec39ca7e18965a5666025e936a64839246018dc..4a2824ffeabf3c37991c6b1db235a7bd967636b5 100755 (executable)
--- 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'};
 
@@ -98,9 +98,9 @@ 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;
+$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";

diff --git a/cgi-bin/ctsim.conf.in b/cgi-bin/ctsim.conf.in
index e0d5977f81dfaad8cc8b6c97dde53ed7e247d69e..e6fd9b43544e920b8b351d2281a19d3944fb3487 100755 (executable)
--- a/cgi-bin/ctsim.conf.in
+++ b/cgi-bin/ctsim.conf.in
@@ -1,6 +1,7 @@
 # @configure_input@
 
 $::bindir = "@prefix@/bin";
+$::lamrundir = "@prefix@/bin";
 $::jobdir = "@webdatadir@";
 $::datadir = "@webdatadir@";
 $::url_datadir = "@webdataurl@";