X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=0f67bedf03d42c61d85151d39c117683c46f5af7;hb=d850a3477e9ccaecfa85e00bc619848fcc29bdb6;hp=06d16e88044ed6bdd91da3ec1c879e3c37f94453;hpb=2f3d6e2580db607105bb072b13e4aff453ae4495;p=ctsim.git

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 06d16e8..0f67bed 100755
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -47,6 +47,8 @@ $error .= "Projection RotAngle must be between 0.1 and 2<br>" if ($PJ_RotAngle <
 #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'});
@@ -82,23 +84,22 @@ my $phantom_fname = "$::datadir/phantom-$tmpid.if";
 my $pj_fname = "$::datadir/pj-$tmpid.pj";
 my $ir_fname = "$::datadir/ir-$tmpid.if";
 my $pj_if_fname = "$::datadir/pj-$tmpid.if";
-my $diff_fname = "$::datadir/diff-$tmpid.if";
+my $sub_fname = "$::datadir/sub-$tmpid.if";
 my $phantom_png = "$::datadir/phantom-$tmpid.png";
 my $ir_png = "$::datadir/ir-$tmpid.png";
 my $pj_png = "$::datadir/pj-$tmpid.png";
-my $diff_png = "$::datadir/diff-$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 $pj_png_url = "$::url_datadir/pj-$tmpid.png";
-my $diff_png_url = "$::url_datadir/diff-$tmpid.png";
+my $sub_png_url = "$::url_datadir/sub-$tmpid.png";
 
 my $pjrec_ver = "$::bindir/pjrec";
 my $phm2pj_ver = "$::bindir/phm2pj";
 my $phm2if_ver = "$::bindir/phm2if";
 my $diff_ver = "$::bindir/if-2";
-my $ifinfo_ver = "$::bindir/ifinfo";
 
 $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;
@@ -107,9 +108,9 @@ $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 $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";
-my $diff_cmd = "$diff_ver $phantom_fname $ir_fname $diff_fname --comp";
-my $compare_cmd = "$ifinfo_ver $phantom_fname $ir_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') {
@@ -119,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 $pj_if_fname $pj_png --auto $auto_window_pj --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";
 
@@ -147,12 +148,12 @@ if ($error ne "") {
   my $pj_out;
   my $pj_if_out;
   my $pjrec_out;
+  my $sub_out;
   my $diff_out;
   my $png_gp_out;
   my $png_pjrec_out;
   my $png_pj_out;
-  my $png_diff_out;
-  my $compare_out;
+  my $png_sub_out;
   $gp_out = `$gp_cmd`;
   if (-s $phantom_fname) {
     $pj_out .= `$pj_cmd`;
@@ -163,14 +164,14 @@ if ($error ne "") {
       $pjrec_out .= `$pjrec_cmd`;
       if (-s $ir_fname) {
 	$png_pjrec_out .= `$png2_cmd`;
+	$sub_out .= `$sub_cmd`;
 	$diff_out .= `$diff_cmd`;
-	$png_diff_out .= `$png4_cmd`;
-	$compare_out = `$compare_cmd`;
+	$png_sub_out .= `$png4_cmd`;
       }
     }
   }
 
-  $cmdout = "$gp_cmd\n $gp_out $pj_cmd\n $pj_out $pj_if_cmd\n $pj_if_out $pjrec_cmd\n $pjrec_out $diff_cmd\n $diff_out $png1_cmd\n $png_gp_out $png2_cmd\n $png_pjrec_out $png3_cmd\n $png_pj_out $png4_cmd\n $png_diff_out";
+  $cmdout = "$gp_cmd\n $gp_out $pj_cmd\n $pj_out $pj_if_cmd\n $pj_if_out $pjrec_cmd\n $pjrec_out $diff_cmd\n $diff_out $png1_cmd\n $png_gp_out $png2_cmd\n $png_pjrec_out $png3_cmd\n $png_pj_out $png4_cmd\n $png_sub_out";
   if (open(LOGFILE,">> $logfile")) {
     flock(LOGFILE,LOCK_EX);
     seek(LOGFILE, 0, 2);
@@ -188,21 +189,21 @@ if ($error ne "") {
   my $png_gp_out_html = $png_gp_out;
   my $png_pjrec_out_html = $png_pjrec_out;
   my $png_pj_out_html = $png_pj_out;
-  my $png_diff_out_html = $png_diff_out;
+  my $png_sub_out_html = $png_sub_out;
   $png_gp_out_html =~ s/\n/<br>/gms;
   $png_pjrec_out_html =~ s/\n/<br>/gms;
   $png_pj_out_html =~ s/\n/<br>/gms;
-  $png_diff_out_html =~ s/\n/<br>/gms;
+  $png_sub_out_html =~ s/\n/<br>/gms;
   $out .= "<TABLE><TR><TD>Phantom Image</TD><TD>Reconstructed Image</TD></TR>\n";
   $out .= "<TR><TD><IMG SRC=\"$phantom_png_url\"><br><FONT SIZE=1>$png_gp_out</FONT></TD>\n";
   $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_pjrec_out</FONT></TD></TR>\n";
   $out .= "<TR><TD>Projection Sinusoid</TD><TD>Phantom/Reconst Error</TD></TR>\n";
   $out .= "<TR><TD><IMG SRC=\"$pj_png_url\"><br><FONT SIZE=1>$png_pj_out</FONT></TD>\n";
-  $out .= "<TD><IMG SRC=\"$diff_png_url\"><br><FONT SIZE=2>$diff_out</FONT><br><FONT SIZE=1>$png_diff_out</FONT></TD></TR>\n";
+  $out .= "<TD><IMG SRC=\"$sub_png_url\"><br><FONT SIZE=2>$sub_out</FONT><br><FONT SIZE=1>$png_sub_out</FONT></TD></TR>\n";
   $out .= "</TABLE>";
   $out .= "Execution time: $execution_time seconds\n";
   $out .= "<p>\nStatistics<br>";
-  $out .= "$compare_out";
+  $out .= "$diff_out";
 }
 
 $out .= "<HR>\n";