r651: *** empty log message ***

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 0f67bedf03d42c61d85151d39c117683c46f5af7..2b7aa78d59b46d44fee7b20592d131457ec0eaa4 100755 (executable)
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -99,7 +99,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;

diff --git a/cgi-bin/ctsim.conf.in b/cgi-bin/ctsim.conf.in
index 2b09f38bf5299361b692671c4d0aa64bb16f9e10..42b88f5c62b068c8b4b3aa13f17f88fb9f4ddd47 100755 (executable)
--- a/cgi-bin/ctsim.conf.in
+++ b/cgi-bin/ctsim.conf.in
@@ -6,5 +6,6 @@ $::jobdir = "@webdatadir@";
 $::datadir = "@webdatadir@";
 $::url_datadir = "@webdataurl@";
 $::mpi_enable = "@mpienable@";
+$::single_process_only = 1;
 
 1;

diff --git a/html/simulate.html.in b/html/simulate.html.in
index bd0745a34768c4510e0d9993c56888f9731b8e10..032260af4bc4513a31c752c56536bea564a274ff 100644 (file)
--- a/html/simulate.html.in
+++ b/html/simulate.html.in
@@ -69,9 +69,7 @@ Backprojection Method:<br>
 <input type="radio" name="IR_Backproj" value="trig">Trig<br>
 <input type="radio" name="IR_Backproj" value="table">Trig Table<br>
 <input type="radio" name="IR_Backproj" value="diff">Difference<br>
-<input type="radio" name="IR_Backproj" value="diff2">Difference Optimized<br>
-<input type="radio" name="IR_Backproj" value="idiff2">Difference Optimized (integer math)<br>
-<input type="radio" name="IR_Backproj" value="idiff3" checked>Difference Highly-optimized (integer math)<br>
+<input type="radio" name="IR_Backproj" value="idiff" checked>Difference Highly-optimized (integer math)<br>
 </td></tr></table>
 <p>
 <input type="submit" value="Simulate"><input type="reset" value="clear fields">

diff --git a/src/views.cpp b/src/views.cpp
index 2624d6a33444ed0259cb91a0bafa9f0611b61e94..afceae446d164897f38e555558737d282ea2716f 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.144 2001/03/30 19:25:00 kevin Exp $
+**  $Id: views.cpp,v 1.145 2001/03/30 21:01:15 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -228,7 +228,7 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract)
 EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
 EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
 EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
-#ifdef wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
 EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
 #endif
 #ifdef HAVE_FFT
@@ -1007,7 +1007,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('2'), IFMENU_FILTER_FFT);
   accelEntries[iEntry++].Set (wxACCEL_ALT,  static_cast<int>('2'), IFMENU_FILTER_IFFT);
 #endif
-#ifdef wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
   accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
 #endif
   wxAcceleratorTable accelTable (iEntry, accelEntries);

diff --git a/src/views.h b/src/views.h
index 058cb8bb7fbe94e25b08d0456135d139aced41b4..01f8945d0388a9850e6d716eb0b96c2ae1eb1ad3 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.54 2001/03/30 19:31:17 kevin Exp $
+**  $Id: views.h,v 1.55 2001/03/30 21:01:15 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -115,7 +115,7 @@ public:
   void OnInverseFourier (wxCommandEvent& event);
   void OnShuffleNaturalToFourierOrder (wxCommandEvent& event);
   void OnShuffleFourierToNaturalOrder (wxCommandEvent& event);
-#ifdef wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
   void OnConvert3d (wxCommandEvent& event);
 #endif