r147: *** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index 3d1fd9073f5983929541a91fea46d55657250aac..c1c153a3dd91279b45159c719ff4d9c31fd6bb26 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ else
 EXTRA_DIRS3=
 endif
 
 EXTRA_DIRS3=
 endif
 

-SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) libctsupport libctsim man html cgi-bin include tools
+SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man html cgi-bin include tools $(EXTRA_DIRS3)

 EXTRA_DIST=acsite.m4 make.bat
 
 
 EXTRA_DIST=acsite.m4 make.bat
 
 

diff --git a/README b/README
index 56ab90b7520f220f70f11786ab8254cb8014b8f1..e552c45d84a42ccd556874c648be8d8fb99e8b24 100644 (file)
--- a/README
+++ b/README
@@ -89,8 +89,8 @@ Perform CT reconstruction and create viewable image file
 Display image information and comparative statistics
   ifinfo ...
 
 Display image information and comparative statistics
   ifinfo ...
 

-There is a sample shell script installed called 'sample-ctsim.sh' that performs 
-the above commands.n
+There is a sample shell script installed called 'sample-ctsim.sh' 
+in the tools direction that performs the above commands.

 
 These functions can be invoked via a web interface with a CGI program 
 as described in the INSTALL file.
 
 These functions can be invoked via a web interface with a CGI program 
 as described in the INSTALL file.

diff --git a/TODO b/TODO
index 8bb000848f507a54f07b34bb5936e1f916f383ed..26437f6056cc5426134459fcd01535aa31860f9a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,49 +28,3 @@ Compare
   Single Image statistics
 
 
   Single Image statistics
 
 

-PROPOSED HDF FILE FORMAT
-========================
-
-If the HDF library is compiled into CTSim, it will be used for the
-raysum and image files.
-
-Reconstruction Groups
----------------------
-Group Name="Recon"
-  SubDataset="ReconParam"
-  SubGroup="Proj"
-    SubDataset="Raysum"
-    SubDataset="Geometry"
-  SubGroup="Phantom"
-    SubDataset "FImage"
-  SubGroup="Reconstr"
-    SubDataset "FImage"
-
-Image Dataset
--------------
-Name="FImage"
-DataType: FLOAT
-Attributes: 
-  "XSize" DOUBLE : X size of pixel in world coordinates
-  "YSize" DOUBLE : Y size of pixel in world coordinates
-
-
-Raysum Group
--------------
-Group Name="Proj"
-Proj Dataset
-  Name="Raysum"
-  DataType: FLOAT
-  Dim: 2 (nviews x ndet)
-  Attributes:
-Geometry Dataset
-  Name="Geometry"
-  DataType: FLOAT
-  Dim: 1  (nviews x 1)
-  Data: For each view, store view_angle
-  Attributes: 
-    "GEOMCODE" INT : Geometry Code
-    "DETSTART"
-    "DETINC"
-    "ROTSTART"
-    "ROTINC"

diff --git a/configure b/configure
index 00fe8341e73032bd281bcca29cbe0c9fe1bfc13d..a445002ce71e05d3883cd8908709849b9d30ce74 100755 (executable)
--- a/configure
+++ b/configure
@@ -4268,7 +4268,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 

-trap 'rm -fr `echo "Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15

 EOF
 cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<EOF
 


@@ -4398,7 +4398,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile"}

 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index 7c27a3e1dc58d18e6516834f9e49de4f62ae72fc..42d68276848eb5cf1c8b0bb91a96f637f71d7abb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -339,4 +339,4 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
 
 CXXFLAGS="$CFLAGS"
 

-AC_OUTPUT(Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile)
+AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile)