X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=49d94357fc7bac7642dfb38a574dd28baac46ca0;hb=b7519560db07975f7a16cd24d12fe61ba0b4d84c;hp=5e27ccb8e7b40176cf94404dc4bbb6e8ee98e216;hpb=08f34bf3ba14d4f436f4d2ef0ee5af1d6eb266ac;p=ctsim.git

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
old mode 100755
new mode 100644
index 5e27ccb..49d9435
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -9,7 +9,7 @@ use Fcntl ':flock';
 require './ctsim.conf';
 
 my $opt_d = 0;
-$ENV{'PATH'} = "$::bindir:$::lamrundir";
+$ENV{'PATH'} = "$::bindir:$::lamrundir:/bin";
 
 my $fromhost = $ENV{'REMOTE_HOST'};
 
@@ -27,26 +27,47 @@ CGI::ReadParse(\%in);
 
 my $error = "";
 
+if ($::single_process_only > 0) {
+  my @processes = `/bin/ps -A`;
+  my $running = 0;
+  foreach my $p (@processes) {
+    if ($p =~ m/ctsimtext/) {
+      $error .= "Another online simulation is currently running.<br>You may wait a moment and then click your browser's <b>Refresh</b> button to resubmit your simulation<br>";
+      last;
+    }
+  }
+}
+
 my $Phantom_Name = FilterMetaChars($in{'Phantom_Name'});
 my $Phantom_Nx = FilterToNumber($in{'Phantom_Nx'});
 my $Phantom_Ny = FilterToNumber($in{'Phantom_Ny'});
+my $Phantom_ViewRatio = FilterToNumber($in{'Phantom_ViewRatio'});
 my $Phantom_NSample = FilterToNumber($in{'Phantom_NSample'});
 $error .= "Phantom name must not be blank<br>" if ($Phantom_Name eq "");
-$error .= "Phantom NX and NY must be between 5 and 1024<br>" if ($Phantom_Nx < 5 || $Phantom_Nx > 1024 || $Phantom_Ny < 5 || $Phantom_Ny > 1024);
-$error .= "Phantom NSample must be between 1 and 10<br>" if ($Phantom_NSample < 1 || $Phantom_NSample > 10);
+$error .= "Phantom Size must be between 5 and 512<br>" if ($Phantom_Nx < 5 || $Phantom_Nx > 512 || $Phantom_Ny < 5 || $Phantom_Ny > 512);
+$error .= "Phantom NSample must be between 1 and 5<br>" if ($Phantom_NSample < 1 || $Phantom_NSample > 5);
+$error .= "View Ratio must be between 0 and 100<br>" if ($Phantom_ViewRatio <= 0 || $Phantom_ViewRatio > 100);
 
+my $PJ_Geometry = FilterMetaChars($in{'PJ_Geometry'});
 my $PJ_NDet = FilterToNumber($in{'PJ_NDet'});
 my $PJ_NRot = FilterToNumber($in{'PJ_NRot'});
+my $PJ_FocalLength = FilterToNumber($in{'PJ_FocalLength'});
 my $PJ_NRay = FilterToNumber($in{'PJ_NRay'});
 my $PJ_RotAngle = FilterToNumber($in{'PJ_RotAngle'});
-$error .= "Projection NDet must be between 5 and 1800<br>" if ($PJ_NDet < 5 || $PJ_NDet > 1800);
-$error .= "Projection NRot must be between 5 and 2048<br>" if ($PJ_NRot < 5 || $PJ_NRot > 2048);
+my $PJ_ScanRatio = FilterToNumber($in{'PJ_ScanRatio'});
+$error .= "Projection NDet must be between 5 and 1000<br>" if ($PJ_NDet < 5 || $PJ_NDet > 1000);
+$error .= "Projection NRot must be between 5 and 1000<br>" if ($PJ_NRot < 5 || $PJ_NRot > 1000);
+$error .= "Projection NRay must be between 1 and 5<br>" if ($PJ_NRay < 1 || $PJ_NRay > 5);
 $error .= "Projection RotAngle must be between 0.1 and 2<br>" if ($PJ_RotAngle < 0.1 || $PJ_RotAngle > 2);
+$error .= "Focal length must be between 1.01 and 10<b>" if ($PJ_FocalLength <= 1 || $PJ_FocalLength > 10);
+$error .= "Scan Ratio must be between 0 and 10<br>" if ($PJ_ScanRatio <= 0 || $PJ_ScanRatio > 10);
 
 #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'});
@@ -82,34 +103,33 @@ 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 $ctrec_ver = "$::bindir/ctrec";
-my $phm2pj_ver = "$::bindir/phm2pj";
-my $phm2if_ver = "$::bindir/phm2if";
-my $diff_ver = "$::bindir/if-2";
-my $ifinfo_ver = "$::bindir/ifinfo";
+my $pjrec_ver = "$::bindir/ctsimtext pjrec";
+my $phm2pj_ver = "$::bindir/ctsimtext phm2pj";
+my $phm2if_ver = "$::bindir/ctsimtext phm2if";
+my $diff_ver = "$::bindir/ctsimtext if2";
 
-$ctrec_ver = "/opt/lam/bin/mpirun N N $::lamrundir/ctrec-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 $pj_cmd = "$phm2pj_ver $pj_fname $PJ_NDet $PJ_NRot --phantom $Phantom_Name --nray $PJ_NRay --rotangle $PJ_RotAngle";
+my $gp_cmd = "$phm2if_ver $phantom_fname $Phantom_Nx $Phantom_Ny --phantom $Phantom_Name --nsample $Phantom_NSample --view-ratio $Phantom_ViewRatio";
+my $pj_cmd = "$phm2pj_ver $pj_fname $PJ_NDet $PJ_NRot --phantom $Phantom_Name --nray $PJ_NRay --rotangle $PJ_RotAngle --geometry $PJ_Geometry --focal-length $PJ_FocalLength --view-ratio $Phantom_ViewRatio --scan-ratio $PJ_ScanRatio";
 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 $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,21 +139,22 @@ 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 --center mode";
+my $png2_cmd = "$::bindir/ifexport $ir_fname $ir_png $window_options --stats --format png --center mode";
+my $png3_cmd = "$::bindir/ifexport $pj_if_fname $pj_png --auto $auto_window_pj --stats --format png --center mode";
+my $png4_cmd = "$::bindir/ifexport $sub_fname $sub_png --auto $auto_window_diff --stats --format png --center mode";
 
-my $title = "CT Simulation Results";
+my $title = "CTSim Results";
 
 my $out = head();
-$out .= "<HTML> <HEAD><TITLE> $title </TITLE></HEAD>\n";
+$out .= "<HTML> <HEAD><TITLE> $title </TITLE><LINK rel=\"stylesheet\" href=\"http://www.ctsim.org/main.css\" type=\"text/css\">
+</HEAD>\n";
 $out .= "<BODY  BGCOLOR=\"#FFFFFF\" TEXT=\"#000000\"  VLINK=\"#800020\" LINK=\"#0000FF\">\n";
 $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";
 }
 
@@ -146,13 +167,13 @@ if ($error ne "") {
   my $gp_out;
   my $pj_out;
   my $pj_if_out;
-  my $ir_out;
+  my $pjrec_out;
+  my $sub_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;
+  my $png_sub_out;
   $gp_out = `$gp_cmd`;
   if (-s $phantom_fname) {
     $pj_out .= `$pj_cmd`;
@@ -160,20 +181,27 @@ 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`;
+	$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 $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";
+  # Delete image files and projection files
+  unlink($phantom_fname);
+  unlink($ir_fname);
+  unlink($pj_fname);
+  unlink($pj_if_fname);
+  unlink($sub_fname);
+
+  $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);
+    print LOGFILE "Client Address: $ENV{'REMOTE_ADDR'}\n";
     print LOGFILE "Job $tmpid\n";
     print LOGFILE $cmdout;
     print LOGFILE "----------------------------------------------------\n";
@@ -186,28 +214,28 @@ 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;
+  my $png_sub_out_html = $png_sub_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";
+  $png_sub_out_html =~ s/\n/<br>/gms;
+  $out .= "<TABLE><TR><TD><b>Phantom Image</b></TD><TD><b>Reconstructed Image</b></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 .= "<TR><TD>Projection Sinusoid</TD><TD>Phantom/Reconst Error</TD></TR>\n";
+  $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_pjrec_out</FONT></TD></TR>\n";
+  $out .= "<TR><TD><b>Projection Sinogram</b></TD><TD><b>Reconstruction Error</b></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 .= "<p><b>Error Measurements</b><br>";
+  $out .= "$diff_out";
+  $out .= "<p>Execution time: $execution_time seconds\n";
 }
 
 $out .= "<HR>\n";
-$out .= "Return to <A HREF=\"/ctsim/index.html\">CT Simulation Designer</a>.<br>\n";
-$out .= "Return to <A HREF=\"www.med-info.com\">Med-Info</a>.\n";
+$out .= "Specify another <a href=\"http://www.ctsim.org/simulate.shtml\">simulation</a>.<br>";
+$out .= "Return to CTSim's <A HREF=\"http://www.ctsim.org\">home</a>.<br>\n";
 $out .= "</BODY> </HTML>";
 $out .= "\n";
 
@@ -227,8 +255,6 @@ else
 if (open(JOBFILES,"> $::jobdir/$tmpid"))
 {
     flock(JOBFILES,LOCK_EX);
-    print JOBFILES "gmt_start=$gmt_start\n";
-    print JOBFILES "gmt_end=$gmt_end\n";
     print JOBFILES "execution_time=$execution_time\n";
     print JOBFILES "Phantom_Name=$Phantom_Name\n";
     print JOBFILES "Phantom_Nx=$Phantom_Nx\n";
@@ -276,7 +302,7 @@ sub head
 sub FilterMetaChars
 {
    my $var = pop(@_);
-   $var =~ /^(\w+)$/;  
+   $var =~ /^([-\w]+)$/;  
    $1;
 }