Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' | Willem Jan Palenstijn | 2015-05-13 | 87 | -934/+1389 |
|\ | |||||
| * | 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) | ||||
| * | | Merge pull request #58 from dmpelt/python-link-size-check | Willem Jan Palenstijn | 2015-05-08 | 4 | -23/+86 |
| |\ \ | | |/ | |/| | Check data size when using 'link' function in Python | ||||
| | * | Do not allow 1D input in Python link method | Daniel M. Pelt | 2015-05-07 | 2 | -16/+4 |
| | | | |||||
| | * | Check data size when using 'link' function in Python | Daan Pelt | 2015-04-30 | 4 | -23/+98 |
| | | | |||||
| * | | Fix memory leak in the config | Jeroen Bédorf | 2015-04-30 | 2 | -0/+7 |
| |/ | |||||
| * | Merge pull request #57 from valeriysokolov/fix-rapidxml-includes | Willem Jan Palenstijn | 2015-04-29 | 3 | -11/+1 |
| |\ | | | | | | | Now include path is system-independent. | ||||
| | * | Now include path is system-independent. | Valerii Sokolov | 2015-04-29 | 3 | -11/+1 |
| |/ | |||||
| * | Fix typo in configure python check | Willem Jan Palenstijn | 2015-04-16 | 1 | -1/+1 |
| | | |||||
| * | Fix bug in astra_mex_data3d('create') zero-initialization | Willem Jan Palenstijn | 2015-04-15 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #52 from wjp/change_geometry3d | Willem Jan Palenstijn | 2015-04-14 | 8 | -1/+218 |
| |\ | | | | | | | Add data3d('change_geometry') | ||||
| | * | Add python data3d.change_geometry | Willem Jan Palenstijn | 2015-04-10 | 3 | -0/+81 |
| | | | |||||
| | * | Add astra_mex_data3d('change_geometry', ...) | Willem Jan Palenstijn | 2015-04-10 | 1 | -1/+109 |
| | | | |||||
| | * | Add changeGeometry function to Data3D classes | Willem Jan Palenstijn | 2015-04-10 | 4 | -0/+28 |
| | | | |||||
| * | | Merge pull request #51 from dmpelt/python-link | Willem Jan Palenstijn | 2015-04-14 | 10 | -9/+196 |
| |\ \ | | |/ | |/| | Add 'link' feature to Python (for 2D and 3D data) | ||||
| | * | Add 'link' feature to Python (for 2D and 3D data) | Daniel M. Pelt | 2015-04-09 | 10 | -9/+196 |
| | | | |||||
| * | | Check input to mex_data3d/link is single | Willem Jan Palenstijn | 2015-04-10 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #50 from valeriysokolov/fix-dart-smoothing | Willem Jan Palenstijn | 2015-04-09 | 1 | -6/+7 |
| |\ \ | | |/ | |/| | Fixed a few CUDA 2D DART bugs. | ||||
| | * | Fixed a few CUDA 2D DART bugs. | Valerii Sokolov | 2015-04-09 | 1 | -6/+7 |
| |/ | | | | | | | | | * Mixed width and height led to incorrect work on rectangular images. * Incorrect weight calculation in `devDartSmoothingRadius` (#47). | ||||
| * | Initialize variables to avoid warning | Willem Jan Palenstijn | 2015-03-30 | 3 | -3/+3 |
| | | | | | | | | | | These variables are never used when uninitialized, but Visual Studio complains about them. | ||||
| * | Fix typo in error message | Willem Jan Palenstijn | 2015-03-30 | 1 | -1/+1 |
| | | |||||
| * | Add missing error on wrong projgeom type in CProjector3D::initialize | Willem Jan Palenstijn | 2015-03-30 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' | Willem Jan Palenstijn | 2015-03-25 | 0 | -0/+0 |
|\ \ | |/ |/| | |||||
| * | Update version | Willem Jan Palenstijn | 2015-01-30 | 2 | -3/+3 |
| | | |||||
| * | Update NEWS | Willem Jan Palenstijn | 2015-01-30 | 1 | -3/+5 |
| | | |||||
| * | Add VS2012 build files | Willem Jan Palenstijn | 2015-01-26 | 11 | -0/+3673 |
| | | |||||
| * | Update copyright to -2015 | Willem Jan Palenstijn | 2015-01-26 | 299 | -598/+598 |
| | | |||||
| * | Sync DART version | Willem Jan Palenstijn | 2015-01-23 | 22 | -1303/+680 |
| | | |||||
| * | Make astra_clear clear projector3d too | Willem Jan Palenstijn | 2015-01-23 | 1 | -0/+1 |
| | | |||||
| * | Store result of nvcc tests in config.log | Willem Jan Palenstijn | 2015-01-23 | 1 | -2/+23 |
| | | |||||
| * | Silence bogus warning: | Christian Häggström | 2015-01-20 | 1 | -0/+1 |
| | | | | | | | | Warning: CudaSirtAlgorithm3D: unused configuration options: SinogramMaskId | ||||
| * | Remove unused files | Willem Jan Palenstijn | 2015-01-19 | 4 | -417/+0 |
| | | |||||
| * | Remove unused stubs from mex_data3d | Willem Jan Palenstijn | 2015-01-19 | 1 | -430/+2 |
| | | |||||
| * | Refactor astra_mex_data3d | Willem Jan Palenstijn | 2015-01-19 | 6 | -493/+827 |
| | | | | | | | | (Modified) patch by Nicola Viganò | ||||
| * | Fix whitespace | Willem Jan Palenstijn | 2015-01-19 | 4 | -53/+53 |
| | | |||||
| * | Remove unused DetectorOffsetX/Y in ProjectionGeometry3D | Willem Jan Palenstijn | 2015-01-19 | 4 | -192/+13 |
| | | |||||
| * | Add CUDA SIRT::doSlabCorrections() function | Willem Jan Palenstijn | 2015-01-19 | 4 | -0/+59 |
| | | | | | | | | | | This function optionally compensates for effectively infinitely large slab-like objects of finite thickness 1. | ||||
| * | Improve cuda 2d header comments | Willem Jan Palenstijn | 2015-01-19 | 2 | -1/+25 |
| | |