Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Avoid defining singleton construction in header file | Willem Jan Palenstijn | 2016-05-17 | 1 | -4/+18 |
| | | | | | | | | That way, the call to new is always executed by code inside libastra. This avoids the situation where a singleton gets created by a copy of the constructor linked into an object file outside of libastra, such as a .mex file, which would then also cause the vtable to be outside of libastra. This situation would cause issues when .mex files are unloaded. | ||||
* | Merge pull request #47 from wjp/OpTomo_out | Willem Jan Palenstijn | 2016-04-26 | 2 | -43/+87 |
|\ | | | | | Give OpTomo FP/BP functions with optional out argument | ||||
| * | Use FP/BP out argument in sample plugin | Willem Jan Palenstijn | 2016-04-26 | 1 | -13/+21 |
| | | |||||
| * | Give OpTomo FP/BP functions with optional out argument | Willem Jan Palenstijn | 2016-04-25 | 1 | -30/+66 |
| | | | | | | | | This allows more efficient use of allocated arrays. | ||||
* | | Merge pull request #46 from dmpelt/python_cxx | Willem Jan Palenstijn | 2016-04-25 | 2 | -2/+6 |
|\ \ | | | | | | | Use CXX for Python compilation as well | ||||
| * | | Add comment about setting CC to CXX | Daniel M. Pelt | 2016-04-19 | 1 | -0/+2 |
| | | | |||||
| * | | Use CXX for Python compilation as well | Daniel M. Pelt | 2016-04-19 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #50 from wjp/data3d_dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Reverse output of astra.data3d.dimensions | ||||
| * | | Reverse output of astra.data3d.dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | This makes the output directly usable in numpy commands like zeros, reshape. We were not using data3d.dimensions ourselves, as far as I can tell. | ||||
* | | | Merge pull request #49 from dmpelt/flatten_to_ravel | Willem Jan Palenstijn | 2016-04-25 | 4 | -7/+7 |
|\ \ \ | |/ / |/| | | Change flatten to ravel in Python code | ||||
| * | | Change flatten to ravel in Python code | Daniel M. Pelt | 2016-04-25 | 4 | -7/+7 |
|/ / | |||||
* | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 1 | -1/+1 |
| | | |||||
* | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 3 | -132/+78 |
| | | |||||
* | | Merge pull request #43 from adler-j/patch-1 | Willem Jan Palenstijn | 2016-04-22 | 1 | -1/+1 |
|\ \ | | | | | | | Fix missing backslash in readme.md install | ||||
| * | | Fix missing backslash in readme.md install | Jonas Adler | 2016-04-19 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #48 from dmpelt/cpu_fft_fix | Willem Jan Palenstijn | 2016-04-22 | 3 | -309/+3382 |
|\ \ | |/ |/| | Change CPU FFT implementation | ||||
| * | Change CPU FFT implementation | Daniel M. Pelt | 2016-04-22 | 3 | -309/+3382 |
|/ | |||||
* | Fix stringToInt parsing doubles | Willem Jan Palenstijn | 2016-04-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #29 from wjp/indexmanager | Willem Jan Palenstijn | 2016-04-15 | 9 | -45/+243 |
|\ | | | | | Add an AstraIndexManager | ||||
| * | Fix build | Willem Jan Palenstijn | 2016-03-01 | 1 | -6/+6 |
| | | |||||
| * | Merge branch 'master' into indexmanager | Willem Jan Palenstijn | 2016-03-01 | 25 | -677/+1097 |
| |\ | |||||
| * | | Add missing help | Willem Jan Palenstijn | 2016-02-22 | 1 | -1/+1 |
| | | | |||||
| * | | Add python astra.astra delete/info based on index manager | Willem Jan Palenstijn | 2016-02-17 | 3 | -2/+88 |
| | | | |||||
| * | | Slightly simplify CAstraObjectManager::remove | Willem Jan Palenstijn | 2016-02-16 | 1 | -3/+2 |
| | | | |||||
| * | | Add astra_mex delete/info based on index manager | Willem Jan Palenstijn | 2016-02-16 | 2 | -0/+50 |
| | | | |||||
| * | | Also remove objects from index manager | Willem Jan Palenstijn | 2016-02-16 | 1 | -1/+10 |
| | | | |||||
| * | | Refactor AstraObjectManager to add an AstraIndexManager | Willem Jan Palenstijn | 2016-02-16 | 5 | -38/+94 |
| | | | | | | | | | | | | | | | The new AstraIndexManager can be used to obtain information about objects without knowing their type. | ||||
* | | | Merge pull request #35 from wjp/relaxation | Willem Jan Palenstijn | 2016-04-14 | 24 | -52/+173 |
|\ \ \ | | | | | | | | | Add relaxation factor option to SIRT, SART | ||||
| * | | | Add relaxation parameters to SIRT3D | Willem Jan Palenstijn | 2016-03-23 | 6 | -2/+37 |
| | | | | |||||
| * | | | Add relaxation parameters to SIRT, SART | Willem Jan Palenstijn | 2016-03-23 | 14 | -12/+96 |
| | | | | |||||
| * | | | Rename ART lambda option to Relaxation | Willem Jan Palenstijn | 2016-03-23 | 2 | -5/+9 |
| | | | | |||||
| * | | | Move CUDA algorithm initialization to its own function | Willem Jan Palenstijn | 2016-03-23 | 4 | -33/+31 |
| | | | | |||||
* | | | | Merge pull request #36 from wjp/sart_raylength | Willem Jan Palenstijn | 2016-04-14 | 1 | -5/+19 |
|\ \ \ \ | | | | | | | | | | | Fix accumulating multiple raylengths in SART | ||||
| * | | | | Fix accumulating multiple raylengths in SART | Willem Jan Palenstijn | 2016-03-23 | 1 | -5/+19 |
| |/ / / | | | | | | | | | | | | | Thanks to @mohamedadaly for noticing. | ||||
* | | | | Merge pull request #37 from wjp/cppcheck | Willem Jan Palenstijn | 2016-04-14 | 4 | -10/+11 |
|\ \ \ \ | | | | | | | | | | | Fix cppcheck warnings | ||||
| * | | | | Fix memory leak | Willem Jan Palenstijn | 2016-03-24 | 1 | -6/+8 |
| | | | | | |||||
| * | | | | Fix cppcheck warnings | Willem Jan Palenstijn | 2016-03-24 | 3 | -4/+3 |
|/ / / / | |||||
* | | | | Merge pull request #116 from 3cHeLoN/opTomo | Willem Jan Palenstijn | 2016-03-24 | 1 | -53/+28 |
|\ \ \ \ | | | | | | | | | | | opTomo: output type matches input type | ||||
| * | | | | Removed regression from opTomo | Folkert Bleichrodt | 2016-03-14 | 1 | -10/+13 |
| | | | | | |||||
| * | | | | opTomo: output type matches input type | Folkert Bleichrodt | 2016-03-02 | 1 | -57/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If opTomo is used to do a forward or backprojection, the precision of the output data now matches the precision of the input data. So the output will be single precision only if the input is stored in single precision. | ||||
* | | | | | Merge pull request #117 from dmpelt/python-bool-fix | Willem Jan Palenstijn | 2016-03-24 | 1 | -4/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Encode Python bool as int in XML instead of str | ||||
| * | | | | Encode Python bool as int in XML instead of str | Daniel M. Pelt | 2016-03-04 | 1 | -4/+8 |
| | | | | | |||||
* | | | | | Fix Windows build | Willem Jan Palenstijn | 2016-03-08 | 1 | -10/+10 |
|/ / / / | |||||
* | | | | Remove outdated cuda paths | Willem Jan Palenstijn | 2016-03-03 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #32 from dmpelt/split-conda | Willem Jan Palenstijn | 2016-03-03 | 5 | -13/+43 |
|\ \ \ \ | | | | | | | | | | | Split conda package into c++ lib and python parts | ||||
| * | | | | Remove with-python from libastra conda build | Daniel M. Pelt | 2016-03-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Include PluginAlgorithm in non-Python builds as well | Daniel M. Pelt | 2016-03-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Split conda package into c++ lib and python parts | Daniel M. Pelt | 2016-03-03 | 4 | -12/+42 |
| | | | | | |||||
* | | | | | Merge pull request #33 from wjp/travis-test | Willem Jan Palenstijn | 2016-03-03 | 2 | -5/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | Use travis-ci's apt packages for cuda | ||||
| * | | | | Use travis-ci's apt packages for cuda | Willem Jan Palenstijn | 2016-03-03 | 1 | -3/+5 |
| | | | | |