r654: *** empty log message ***

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index ae32a901553285ae9a2155f50d36825dc428d58d..4ead487c68ac565c3806fbb42266ccddb62497f5 100755 (executable)
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -46,14 +46,17 @@ $error .= "Phantom name must not be blank<br>" if ($Phantom_Name eq "");
 $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_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 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);
 
 #my $IR_Nx = FilterToNumber($in{'IR_Nx'});
 #my $IR_Ny = FilterToNumber($in{'IR_Ny'});
@@ -118,7 +121,7 @@ $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_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";
 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";

diff --git a/html/simulate.html.in b/html/simulate.html.in
index 032260af4bc4513a31c752c56536bea564a274ff..88c7abd27d3a795b20a29ca21adadf553837bb9c 100644 (file)
--- a/html/simulate.html.in
+++ b/html/simulate.html.in
@@ -29,12 +29,13 @@ MPI Supercomputing:<br>
 </td><td valign="top">
 <h3>Simulate X-Ray acquistion</h3>
 Geometry:<br>
-<INPUT type="radio" name="geometry" value="parallel" checked>Parallel<br>
-<INPUT type="radio" name="geometry" value="equiangular">Equiangular<br>
-<INPUT type="radio" name="geometry" value="collinear">Collinear<br>
+<INPUT type="radio" name="PJ_Geometry" value="parallel" checked>Parallel<br>
+<INPUT type="radio" name="PJ_Geometry" value="equiangular">Equiangular<br>
+<INPUT type="radio" name="PJ_Geometry" value="equilinear">Equilinear<br>
 <p>
 Number of Detectors: <input type="text" name="PJ_NDet" size="4" value="367"><p>
 Number of Rotations: <input type="text" name="PJ_NRot" size="4" value="320"><p>
+Focal Length: <input type="text" name="PJ_FocalLength" size="4" value="2.0"><p>
 Number of Rays<br>(samples) per detector: <input type="text" name="PJ_NRay" size="2" value="3"><p>
 Rotation Angle<br>as a multiple of PI: <input type="text" name="PJ_RotAngle" size="3" value="1.0"><br>
 </td><td valign="top">