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

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 898aa89..06d16e8 100755
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -94,19 +94,22 @@ 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 $ctrec_ver = "$::bindir/ctrec";
+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;
+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;
 $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 $ir_cmd = "$ctrec_ver $pj_fname $ir_fname $IR_Nx $IR_Ny --filter $IR_Filter --filter-param $IR_Filter_Param --interp $IR_Interp --backproj $IR_Backproj";
+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 $window_options = "--auto $auto_window_img";
 if ($Disp_Min ne 'auto') {
@@ -130,7 +133,7 @@ $out .= "<H1>$title</H1><HR>\n";
 
 if ($opt_d) {
     $out .= "<H2>Commands</H2>\n";
-    $out .= "$gp_cmd<br>\n$pj_cmd<br>\n$pj_if_cmd<br>\n$ir_cmd<br>\n$diff_cmd<br>\n$png1_cmd<br>\n$png2_cmd<br>\n" .
+    $out .= "$gp_cmd<br>\n$pj_cmd<br>\n$pj_if_cmd<br>\n$pjrec_cmd<br>\n$diff_cmd<br>\n$png1_cmd<br>\n$png2_cmd<br>\n" .
             "$png3_cmd<br>\n$png4_cmd<br>\n";
 }
 
@@ -143,12 +146,13 @@ if ($error ne "") {
   my $gp_out;
   my $pj_out;
   my $pj_if_out;
-  my $ir_out;
+  my $pjrec_out;
   my $diff_out;
   my $png_gp_out;
-  my $png_ir_out;
+  my $png_pjrec_out;
   my $png_pj_out;
   my $png_diff_out;
+  my $compare_out;
   $gp_out = `$gp_cmd`;
   if (-s $phantom_fname) {
     $pj_out .= `$pj_cmd`;
@@ -156,16 +160,17 @@ if ($error ne "") {
     if (-s $pj_fname) {
       $pj_if_out .= `$pj_if_cmd`;
       $png_pj_out .= `$png3_cmd`;
-      $ir_out .= `$ir_cmd`;
+      $pjrec_out .= `$pjrec_cmd`;
       if (-s $ir_fname) {
-	$png_ir_out .= `$png2_cmd`;
+	$png_pjrec_out .= `$png2_cmd`;
 	$diff_out .= `$diff_cmd`;
 	$png_diff_out .= `$png4_cmd`;
+	$compare_out = `$compare_cmd`;
       }
     }
   }
 
-  $cmdout = "$gp_cmd\n $gp_out $pj_cmd\n $pj_out $pj_if_cmd\n $pj_if_out $ir_cmd\n $ir_out $diff_cmd\n $diff_out $png1_cmd\n $png_gp_out $png2_cmd\n $png_ir_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_diff_out";
   if (open(LOGFILE,">> $logfile")) {
     flock(LOGFILE,LOCK_EX);
     seek(LOGFILE, 0, 2);
@@ -181,21 +186,23 @@ if ($error ne "") {
     $out .= "<H3>Command Output</H3>$cmdout<HR>\n";
   }
   my $png_gp_out_html = $png_gp_out;
-  my $png_ir_out_html = $png_ir_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;
   $png_gp_out_html =~ s/\n/<br>/gms;
-  $png_ir_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;
   $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_ir_out</FONT></TD></TR>\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 .= "</TABLE>";
   $out .= "Execution time: $execution_time seconds\n";
+  $out .= "<p>\nStatistics<br>";
+  $out .= "$compare_out";
 }
 
 $out .= "<HR>\n";