X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=6b0da4833601b1a57a6bf13482e72ddb62430a0f;hp=660ac60b504445ad9182d9db2427424b2b6030c4;hb=2ab37d1cdf6caa543510f370cbeb3749d0d61fe0;hpb=1e9bee778a3f9fbad3a0967ef88d882f120a5845 diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in index 660ac60..6b0da48 100755 --- a/cgi-bin/ctsim.cgi.in +++ b/cgi-bin/ctsim.cgi.in @@ -78,11 +78,11 @@ 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 $phantom_fname = "$::datadir/phantom-$tmpid.if"; 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 $ir_fname = "$::datadir/ir-$tmpid.if"; +my $rs_if_fname = "$::datadir/rs-$tmpid.if"; +my $diff_fname = "$::datadir/diff-$tmpid.if"; my $phantom_png = "$::datadir/phantom-$tmpid.png"; my $ir_png = "$::datadir/ir-$tmpid.png"; my $rs_png = "$::datadir/rs-$tmpid.png"; @@ -96,15 +96,15 @@ 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"; +my $phm2if_ver = "$::bindir/phm2if"; +my $diff_ver = "$::bindir/if-2"; $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; +$phm2if_ver = "/opt/lam/bin/mpirun N N $::lamrundir/phm2if-lam" if $MPI; -my $gp_cmd = "$phm2sdf_ver $phantom_fname $Phantom_Nx $Phantom_Ny --phantom $Phantom_Name --nsample $Phantom_NSample"; +my $gp_cmd = "$phm2if_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_if_cmd = "$::bindir/rs2if $rs_fname $rs_if_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/if2img $phantom_fname $phantom_png $window_options --stats --format png"; +my $png2_cmd = "$::bindir/if2img $ir_fname $ir_png $window_options --stats --format png"; +my $png3_cmd = "$::bindir/if2img $rs_if_fname $rs_png --auto $auto_window_rs --stats --format png"; +my $png4_cmd = "$::bindir/if2img $diff_fname $diff_png --auto $auto_window_diff --stats --format png"; my $title = "CT Simulation Results"; @@ -130,7 +130,7 @@ $out .= "