Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #84 from dmpelt/log-highlevel-fix | Willem Jan Palenstijn | 2015-07-17 | 3 | -9/+9 |
|\ | | | | | Fix formatting when passing strings to log from high-level code | ||||
| * | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 3 | -9/+9 |
|/ | |||||
* | Merge pull request #75 from wjp/cuda_options | Willem Jan Palenstijn | 2015-06-26 | 14 | -73/+197 |
|\ | | | | | Move supersampling options from Algorithm to CudaProjector | ||||
| * | Update sample | Willem Jan Palenstijn | 2015-06-23 | 1 | -18/+10 |
| | | |||||
| * | Use supersampling options from CudaProjector2D | Willem Jan Palenstijn | 2015-06-23 | 3 | -36/+73 |
| | | |||||
| * | Use supersampling options from CudaProjector3D | Willem Jan Palenstijn | 2015-06-04 | 6 | -18/+88 |
| | | |||||
| * | Add supersampling options to Cuda Projectors | Willem Jan Palenstijn | 2015-05-22 | 4 | -1/+26 |
| | | |||||
* | | Merge pull request #76 from dmpelt/projector-configuration-fix | Willem Jan Palenstijn | 2015-06-26 | 7 | -11/+42 |
|\ \ | | | | | | | Configuration fixes | ||||
| * | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 4 | -9/+28 |
| | | | |||||
| * | | Add extra null check for ExtraDetectorOffset | Daniel M. Pelt | 2015-06-25 | 1 | -3/+5 |
| | | | |||||
| * | | Include ExtraDetectorOffset in returned configuration | Daniel M. Pelt | 2015-06-24 | 1 | -0/+3 |
| | | | |||||
| * | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 2 | -2/+9 |
|/ / | |||||
* | | Add some common temporary file patterns to .gitignore. | Willem Jan Palenstijn | 2015-06-23 | 1 | -22/+30 |
| | | | | | | | | Also add leading slashes to full paths for consistency. | ||||
* | | Merge pull request #74 from dmpelt/small-fixes | Willem Jan Palenstijn | 2015-06-23 | 4 | -5/+28 |
|\ \ | | | | | | | Small fixes | ||||
| * | | Additional module name fix in documentation | Daniel M. Pelt | 2015-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Add a .gitignore to ignore build files | Daniel M. Pelt | 2015-06-20 | 1 | -0/+23 |
| | | | |||||
| * | | Actually use the rec_type argument in astra_create_reconstruction_cuda | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Fix matlab compilation without CUDA | Daniel M. Pelt | 2015-06-20 | 1 | -2/+2 |
| | | | |||||
| * | | Fix wrong module name in documentation | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 |
| | | | |||||
* | | | Don't take address of temporary. | Valerii Sokolov | 2015-06-22 | 1 | -2/+4 |
|/ / | |||||
* | | Increment version to 1.6 | Willem Jan Palenstijn | 2015-05-29 | 2 | -3/+3 |
| | | |||||
* | | Fix vs2008 build | Willem Jan Palenstijn | 2015-05-29 | 2 | -10/+19 |
| | | |||||
* | | Update utility files | Willem Jan Palenstijn | 2015-05-29 | 3 | -287/+438 |
| | | |||||
* | | Update README, NEWS | Willem Jan Palenstijn | 2015-05-29 | 4 | -4/+16 |
| | | |||||
* | | Fix optomo reconstruction for 1D input | Daniel M. Pelt | 2015-05-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #65 from dmpelt/cython-char-fix | Willem Jan Palenstijn | 2015-05-26 | 1 | -7/+14 |
|\ \ | | | | | | | Hold reference to results of six.b calls | ||||
| * | | Hold reference to results of six.b calls | Daan Pelt | 2015-05-18 | 1 | -7/+14 |
| | | | |||||
* | | | Merge pull request #66 from dmpelt/fix-old-six | Willem Jan Palenstijn | 2015-05-26 | 3 | -3/+18 |
|\ \ \ | | | | | | | | | Fix range import for old six versions | ||||
| * | | | Fix range import for old six versions | Daniel M. Pelt | 2015-05-18 | 3 | -3/+18 |
| | | | | |||||
* | | | | Fix Python samples for updated interface and old six versions | Daniel M. Pelt | 2015-05-26 | 2 | -4/+12 |
| |_|/ |/| | | |||||
* | | | Add note about autogen.sh | Willem Jan Palenstijn | 2015-05-20 | 2 | -0/+2 |
|/ / | |||||
* | | Merge pull request #63 from wjp/optomo_sample | Willem Jan Palenstijn | 2015-05-15 | 1 | -0/+61 |
|\ \ | | | | | | | Create python sample for OpTomo | ||||
| * | | Create python sample for OpTomo | Willem Jan Palenstijn | 2015-05-15 | 1 | -0/+61 |
| | | | |||||
* | | | Merge pull request #49 from 3cHeLoN/astra-spot | Willem Jan Palenstijn | 2015-05-15 | 3 | -0/+371 |
|\ \ \ | |/ / |/| | | Astra spot | ||||
| * | | Add copyright header | Willem Jan Palenstijn | 2015-05-15 | 1 | -0/+10 |
| | | | |||||
| * | | Add note about Spot to sample script | Willem Jan Palenstijn | 2015-05-15 | 1 | -0/+8 |
| | | | |||||
| * | | Added ASTRA-Spot operator opTomo | Folkert Bleichrodt | 2015-05-15 | 3 | -0/+353 |
| | | | | | | | | | | | | | | | | | | A Spot operator for the ASTRA projectors. Wraps the forward and backprojection operation into a Spot operator, which can be used with matrix-vector syntax in Matlab. | ||||
* | | | Sync README.txt with README.md | Willem Jan Palenstijn | 2015-05-13 | 1 | -3/+6 |
| | | | |||||
* | | | Add DOI link for JSB paper as well | Willem Jan Palenstijn | 2015-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | Update README.md | Wim van Aarle | 2015-05-13 | 1 | -2/+7 |
| | | | | | | | | | updated references | ||||
* | | | fix memleaks in test | joergkappes | 2015-05-08 | 2 | -0/+10 |
| | | | |||||
* | | | fix to small memory allocation | joergkappes | 2015-05-08 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #61 from wjp/xmlnode_cleanup | Willem Jan Palenstijn | 2015-05-08 | 56 | -730/+639 |
|\ \ \ | | | | | | | | | Clean up XMLNode | ||||
| * | | | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 5 | -117/+127 |
| | | | | | | | | | | | | | | | | setContent and getContent were using different XML formats previously. | ||||
| * | | | Add extra XMLNode/XMLDocument/Config test | Willem Jan Palenstijn | 2015-05-06 | 1 | -0/+16 |
| | | | | |||||
| * | | | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 56 | -635/+518 |
| | | | | | | | | | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | ||||
* | | | | Merge pull request #46 from dmpelt/spot-like-python | Willem Jan Palenstijn | 2015-05-08 | 5 | -139/+201 |
|\ \ \ \ | | | | | | | | | | | Add SPOT-like object for Python (overrides `__mul__` and works with scipy.sparse.linalg) | ||||
| * | | | | Rename optomo.py for Python 2 support | Daniel M. Pelt | 2015-05-08 | 2 | -1/+1 |
| | | | | | |||||
| * | | | | Use superclass __mul__ in Python OpTomo __mul__ | Daniel M. Pelt | 2015-05-07 | 1 | -22/+11 |
| | | | | | |||||
| * | | | | Add SPOT-like object for Python (overrides `__mul__` and works with ↵ | Daan Pelt | 2015-05-04 | 5 | -139/+212 |
| |/ / / | | | | | | | | | | | | | scipy.sparse.linalg) |