X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=a497dd908502f1dcc3988137fc196b99161bf5b7;hb=9c75a49d81caa44eb0397f60cc442ebab1738309;hp=959d69b5c6fafce2991de45b0fdc823c515c33ef;hpb=6850134e4711a842cc7c0a306a9e4243df06b952;p=ctsim.git

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 959d69b..a497dd9 100755
--- 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,20 +27,35 @@ CGI::ReadParse(\%in);
 
 my $error = "";
 
+if ($::single_process_only > 0) {
+  my @processes = '/bin/ps -A';
+  my $running = 0;
+  foreach $p (@processes) {
+    if ($p ~= /ctsimtext/) {
+      $running = 1;
+      break;
+    }
+    if ($running > 0) {
+      $error .= "Another online simulation is currently running.<p>Click your browser's <i>Refresh</i> button to resubmit your simulation<br>";
+      exit(0);
+    }
+}
+
 my $Phantom_Name = FilterMetaChars($in{'Phantom_Name'});
 my $Phantom_Nx = FilterToNumber($in{'Phantom_Nx'});
 my $Phantom_Ny = FilterToNumber($in{'Phantom_Ny'});
 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 NX and NY 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);
 
 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<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);
+$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);
 
 #my $IR_Nx = FilterToNumber($in{'IR_Nx'});
@@ -99,7 +114,7 @@ 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 $diff_ver = "$::bindir/if2";
 
 $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;
@@ -120,10 +135,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 $sub_fname $sub_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";