Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | updated configuration of ParallelVecProjectionGeometry | Wim van Aarle | 2015-05-26 | 1 | -13/+7 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into parallel_vec | Wim van Aarle | 2015-05-26 | 157 | -6543/+12187 |
|\ | | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp | ||||
| * | 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) | ||||
| * | | | | 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 pull request #30 from dmpelt/logging | Willem Jan Palenstijn | 2015-03-20 | 54 | -209/+2827 |
| |\ | | | | | | | New logging API | ||||
| | * | Use FlushFileBuffers in Windows | Willem Jan Palenstijn | 2015-03-20 | 1 | -1/+8 |
| | | | |||||
| | * | Fix indentation | Willem Jan Palenstijn | 2015-03-20 | 2 | -103/+103 |
| | | |