X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=inline;f=cgi-bin%2Fctsim.cgi.in;h=0f67bedf03d42c61d85151d39c117683c46f5af7;hb=f1e69bf8888b1462007c93c8d6bf3ae1e0ecec20;hp=6b0da4833601b1a57a6bf13482e72ddb62430a0f;hpb=2ab37d1cdf6caa543510f370cbeb3749d0d61fe0;p=ctsim.git
diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 6b0da48..0f67bed 100755
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -22,7 +22,7 @@ CGI::ReadParse(\%in);
# Incoming variables
# Phantom_Name, Phantom_Nx, Phantom_Ny, Phantom_NSample
-# RS_NDet, RS_NRot, RS_NRay, RS_RotAngle,
+# PJ_NDet, PJ_NRot, PJ_NRay, PJ_RotAngle,
# IR_Nx, IR_Ny, IR_Filter, IR_Filter_Param
my $error = "";
@@ -35,18 +35,20 @@ $error .= "Phantom name must not be blank
" if ($Phantom_Name eq "");
$error .= "Phantom NX and NY must be between 5 and 1024
" if ($Phantom_Nx < 5 || $Phantom_Nx > 1024 || $Phantom_Ny < 5 || $Phantom_Ny > 1024);
$error .= "Phantom NSample must be between 1 and 10
" if ($Phantom_NSample < 1 || $Phantom_NSample > 10);
-my $RS_NDet = FilterToNumber($in{'RS_NDet'});
-my $RS_NRot = FilterToNumber($in{'RS_NRot'});
-my $RS_NRay = FilterToNumber($in{'RS_NRay'});
-my $RS_RotAngle = FilterToNumber($in{'RS_RotAngle'});
-$error .= "Raysum NDet must be between 5 and 1800
" if ($RS_NDet < 5 || $RS_NDet > 1800);
-$error .= "Raysum NRot must be between 5 and 2048
" if ($RS_NRot < 5 || $RS_NRot > 2048);
-$error .= "Raysum RotAngle must be between 0.1 and 2
" if ($RS_RotAngle < 0.1 || $RS_RotAngle > 2);
+my $PJ_NDet = FilterToNumber($in{'PJ_NDet'});
+my $PJ_NRot = FilterToNumber($in{'PJ_NRot'});
+my $PJ_NRay = FilterToNumber($in{'PJ_NRay'});
+my $PJ_RotAngle = FilterToNumber($in{'PJ_RotAngle'});
+$error .= "Projection NDet must be between 5 and 1800
" if ($PJ_NDet < 5 || $PJ_NDet > 1800);
+$error .= "Projection NRot must be between 5 and 2048
" if ($PJ_NRot < 5 || $PJ_NRot > 2048);
+$error .= "Projection RotAngle must be between 0.1 and 2
" if ($PJ_RotAngle < 0.1 || $PJ_RotAngle > 2);
#my $IR_Nx = FilterToNumber($in{'IR_Nx'});
#my $IR_Ny = FilterToNumber($in{'IR_Ny'});
my $IR_Nx = $Phantom_Nx;
my $IR_Ny = $Phantom_Ny;
+my $IR_FilterMethod = FilterMetaChars($in{'IR_FilterMethod'});
+my $IR_Zeropad = FilterToNumber($in{'IR_Zeropad'});
my $IR_Filter = FilterMetaChars($in{'IR_Filter'});
my $IR_Filter_Param = FilterToNumber($in{'IR_Filter_Param'});
my $IR_Interp = FilterMetaChars($in{'IR_Interp'});
@@ -74,39 +76,41 @@ $error .= "IR Filter Parameter must be between 0 and 1
" if ($IR_Filter_Param
my $tmpid = $$;
my $auto_window_img = "std0.1";
my $auto_window_diff = "std1";
-my $auto_window_rs = "full";
+my $auto_window_pj = "full";
my $logfile = "$::jobdir/ctsim.log";
my $result_fname = "$::datadir/result-$tmpid.html";
my $phantom_fname = "$::datadir/phantom-$tmpid.if";
-my $rs_fname = "$::datadir/rs-$tmpid.rs";
+my $pj_fname = "$::datadir/pj-$tmpid.pj";
my $ir_fname = "$::datadir/ir-$tmpid.if";
-my $rs_if_fname = "$::datadir/rs-$tmpid.if";
-my $diff_fname = "$::datadir/diff-$tmpid.if";
+my $pj_if_fname = "$::datadir/pj-$tmpid.if";
+my $sub_fname = "$::datadir/sub-$tmpid.if";
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 $pj_png = "$::datadir/pj-$tmpid.png";
+my $sub_png = "$::datadir/sub-$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 $pj_png_url = "$::url_datadir/pj-$tmpid.png";
+my $sub_png_url = "$::url_datadir/sub-$tmpid.png";
-my $ctrec_ver = "$::bindir/ctrec";
-my $phm2rs_ver = "$::bindir/phm2rs";
+my $pjrec_ver = "$::bindir/pjrec";
+my $phm2pj_ver = "$::bindir/phm2pj";
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;
+
+$pjrec_ver = "/opt/lam/bin/mpirun N N $::lamrundir/pjrec-lam" if $MPI;
+$phm2pj_ver = "/opt/lam/bin/mpirun N N $::lamrundir/phm2pj-lam" if $MPI;
$phm2if_ver = "/opt/lam/bin/mpirun N N $::lamrundir/phm2if-lam" if $MPI;
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_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";
+my $pj_cmd = "$phm2pj_ver $pj_fname $PJ_NDet $PJ_NRot --phantom $Phantom_Name --nray $PJ_NRay --rotangle $PJ_RotAngle";
+my $pj_if_cmd = "$::bindir/pj2if $pj_fname $pj_if_fname";
+my $pjrec_cmd = "$pjrec_ver $pj_fname $ir_fname $IR_Nx $IR_Ny --filter $IR_Filter --filter-param $IR_Filter_Param --interp $IR_Interp --backproj $IR_Backproj --filter-method $IR_FilterMethod --zeropad $IR_Zeropad";
+my $sub_cmd = "$diff_ver $phantom_fname $ir_fname $sub_fname --sub";
+my $diff_cmd = "$diff_ver $phantom_fname $ir_fname --comp";
my $window_options = "--auto $auto_window_img";
if ($Disp_Min ne 'auto') {
@@ -116,10 +120,10 @@ if ($Disp_Max ne 'auto') {
$window_options .= " --max $Disp_Max";
}
-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 $png1_cmd = "$::bindir/ifexport $phantom_fname $phantom_png $window_options --stats --format png";
+my $png2_cmd = "$::bindir/ifexport $ir_fname $ir_png $window_options --stats --format png";
+my $png3_cmd = "$::bindir/ifexport $pj_if_fname $pj_png --auto $auto_window_pj --stats --format png";
+my $png4_cmd = "$::bindir/ifexport $sub_fname $sub_png --auto $auto_window_diff --stats --format png";
my $title = "CT Simulation Results";
@@ -130,7 +134,7 @@ $out .= "
Phantom Image | Reconstructed Image |
$png_gp_out | \n";
- $out .= "$png_ir_out |
Raysum Sinusoid | Phantom/Reconst Error |
$png_rs_out | \n";
- $out .= "$diff_out $png_diff_out | $png_pjrec_out | \n";
+ $out .= "
Projection Sinusoid | Phantom/Reconst Error |
$png_pj_out | \n";
+ $out .= "$sub_out $png_sub_out |
\nStatistics
";
+ $out .= "$diff_out";
}
$out .= "