diff options
| -rw-r--r-- | .gitignore | 23 | ||||
| -rw-r--r-- | matlab/mex/astra_mex_c.cpp | 4 | ||||
| -rw-r--r-- | matlab/tools/astra_create_reconstruction_cuda.m | 2 | ||||
| -rw-r--r-- | python/docSRC/operator.rst | 4 |
4 files changed, 28 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ddfb628 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +python/build/* +python/finalbuild/* +python/astra/*.pyc +python/astra/*.cpp +python/astra/*.c +python/astra/config.pxi + +build/linux/.libs/* +build/linux/Makefile +build/linux/aclocal.m4 +build/linux/autom4te.cache/* +build/linux/config.guess +build/linux/config.log +build/linux/config.status +build/linux/config.sub +build/linux/configure +build/linux/cuda/* +build/linux/install-sh +build/linux/libastra.la +build/linux/libtool +build/linux/ltmain.sh +build/linux/src/* +build/linux/matlab/* diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index 4a331f5..a9b9654 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -36,9 +36,9 @@ $Id$ #include "mexInitFunctions.h" #include "astra/Globals.h" - +#ifdef ASTRA_CUDA #include "../cuda/2d/darthelper.h" - +#endif using namespace std; using namespace astra; diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m index 7d9e1dd..7d0421c 100644 --- a/matlab/tools/astra_create_reconstruction_cuda.m +++ b/matlab/tools/astra_create_reconstruction_cuda.m @@ -45,7 +45,7 @@ if strcmp(rec_type,'') end % configure -cfg = astra_struct('SIRT_CUDA'); +cfg = astra_struct(rec_type); cfg.ProjectionGeometry = proj_geom; cfg.ReconstructionGeometry = vol_geom; cfg.ProjectionDataId = sinogram_id; diff --git a/python/docSRC/operator.rst b/python/docSRC/operator.rst index f5369fa..fe500ba 100644 --- a/python/docSRC/operator.rst +++ b/python/docSRC/operator.rst @@ -1,7 +1,7 @@ -OpTomo class: the :mod:`operator` module +OpTomo class: the :mod:`optomo` module ============================================== -.. automodule:: astra.operator +.. automodule:: astra.optomo :members: :undoc-members: :show-inheritance: |