X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi;fp=cgi-bin%2Fctsim.cgi;h=d75e46627c77efadc5d29028954a1164098490f5;hb=2a0006ec846e8da055fe002cb1611853dd01270c;hp=10f754914c06d69c366210cae998210279413fc5;hpb=13838bda88b63a2535b5baaf7197006767de4b8e;p=ctsim.git diff --git a/cgi-bin/ctsim.cgi b/cgi-bin/ctsim.cgi index 10f7549..d75e466 100644 --- a/cgi-bin/ctsim.cgi +++ b/cgi-bin/ctsim.cgi @@ -96,18 +96,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-mpi" if $MPI; +$phm2rs_ver = "/opt/lam/bin/mpirun N N $bindir/phm2rs-mpi" if $MPI; +$phm2sdf_ver = "/opt/lam/bin/mpirun N N $bindir/phm2sdf-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 $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";