Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #101 from wjp/composite | Willem Jan Palenstijn | 2015-12-04 | 7 | -10/+220 |
|\ | | | | | Add CompositeGeometryManager | ||||
| * | Add utility functions for creating FP/BP JobLists | Willem Jan Palenstijn | 2015-12-04 | 1 | -0/+2 |
| | | |||||
| * | Add CompositeGeometryManager | Willem Jan Palenstijn | 2015-12-04 | 7 | -10/+218 |
| | | | | | | | | | | This handles FP and BP operations on multiple data objects at once, splitting them to fit in GPU memory where necessary. | ||||
* | | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 3 | -13/+134 |
|\ \ | |/ |/| | Add support for Python algorithm plugins | ||||
| * | Fix Windows build | Willem Jan Palenstijn | 2015-12-02 | 1 | -1/+1 |
| | | |||||
| * | Avoid unnecessary include in header | Willem Jan Palenstijn | 2015-12-02 | 1 | -3/+6 |
| | | |||||
| * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 16 | -65/+60 |
| |\ | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | ||||
| * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 1 | -0/+3 |
| | | | | | | | | | | | | when running in Matlab | ||||
| * | | Fix numpy lapack loading when running in Matlab | Daniel M. Pelt | 2015-07-23 | 1 | -0/+2 |
| | | | |||||
| * | | Remove config text file loading for plugins | Daniel M. Pelt | 2015-07-23 | 1 | -2/+1 |
| | | | |||||
| * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 2 | -0/+98 |
| | | | |||||
| * | | Add hooks for plugin support to AstraObjectFactory | Willem Jan Palenstijn | 2015-07-23 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | To use these hooks, add a specialization of findPlugin for the desired type of object (e.g., Algorithms). | ||||
| * | | Fix comments | Willem Jan Palenstijn | 2015-07-23 | 1 | -5/+5 |
| | | | |||||
| * | | Reduce code duplication | Willem Jan Palenstijn | 2015-07-23 | 1 | -8/+5 |
| | | | |||||
* | | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-12-02 | 16 | -64/+50 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix whitespace | Willem Jan Palenstijn | 2015-10-09 | 4 | -8/+8 |
| | | | |||||
| * | | Improve option passing through CudaProjector2D | Willem Jan Palenstijn | 2015-10-09 | 10 | -60/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector2D. Also refactor CudaReconstructionAlgorithm::initialize/check to avoid code duplication with ReconstructionAlgorithm. | ||||
| * | | Improve option passing through CudaProjector3D | Willem Jan Palenstijn | 2015-10-09 | 6 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector3D. Thanks to Nicola Vigano for part of the patch. | ||||
* | | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-09-16 | 7 | -43/+75 |
|\| | | | | | | | | | | | | | | Conflicts: src/CudaBackProjectionAlgorithm3D.cpp | ||||
| * | | Merge pull request #75 from wjp/cuda_options | Willem Jan Palenstijn | 2015-06-26 | 2 | -1/+10 |
| |\ \ | | |/ | |/| | Move supersampling options from Algorithm to CudaProjector | ||||
| | * | Add supersampling options to Cuda Projectors | Willem Jan Palenstijn | 2015-05-22 | 2 | -1/+10 |
| | | | |||||
| * | | Increment version to 1.6 | Willem Jan Palenstijn | 2015-05-29 | 1 | -2/+2 |
| |/ | |||||
| * | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -8/+27 |
| | | | | | | | | setContent and getContent were using different XML formats previously. | ||||
| * | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 4 | -33/+35 |
| | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | ||||
| * | Fix memory leak in the config | Jeroen Bédorf | 2015-04-30 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-04-15 | 7 | -72/+912 |
|\| | |||||
| * | Merge pull request #52 from wjp/change_geometry3d | Willem Jan Palenstijn | 2015-04-14 | 2 | -0/+10 |
| |\ | | | | | | | Add data3d('change_geometry') | ||||
| | * | Add changeGeometry function to Data3D classes | Willem Jan Palenstijn | 2015-04-10 | 2 | -0/+10 |
| | | | |||||
| * | | Add 'link' feature to Python (for 2D and 3D data) | Daniel M. Pelt | 2015-04-09 | 2 | -0/+50 |
| |/ | |||||
| * | Use FlushFileBuffers in Windows | Willem Jan Palenstijn | 2015-03-20 | 1 | -1/+8 |
| | | |||||
| * | Fix windows build | Willem Jan Palenstijn | 2015-03-19 | 2 | -1/+14 |
| | | |||||
| * | Use a less verbose default fmt for screen logging and cleaner messages | Daniel M. Pelt | 2015-03-13 | 1 | -4/+4 |
| | | |||||
| * | Enable logging to Matlab window using callback function | Daniel M. Pelt | 2015-03-13 | 2 | -1/+61 |
| | | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method. | ||||
| * | Adds ASTRA_*** defines for easier logging, and changes internal calls to ↵ | Daniel M. Pelt | 2015-03-13 | 1 | -1/+4 |
| | | | | | | | | these defines | ||||
| * | Adds new logging capabilities (based on clog.h) | Daniel M. Pelt | 2015-03-10 | 2 | -0/+769 |
| | | |||||
| * | Remove old Logging code (only used in fft.cu) | Daniel M. Pelt | 2015-03-09 | 1 | -72/+0 |
| | | |||||
* | | Add 3d geometry normalization functions | Willem Jan Palenstijn | 2015-03-06 | 1 | -0/+53 |
|/ | |||||
* | Untangle cuda and astra includes | Willem Jan Palenstijn | 2015-03-02 | 5 | -6/+123 |
| | |||||
* | Merge pull request #20 from wvaarle/matlab-get-geometry | Willem Jan Palenstijn | 2015-02-27 | 14 | -41/+98 |
|\ | | | | | 'get_geometry' functions in the matlab layer | ||||
| * | code cleanup | Wim van Aarle | 2015-02-26 | 1 | -1/+0 |
| | | |||||
| * | updated docs | Wim van Aarle | 2015-02-26 | 6 | -40/+19 |
| | | |||||
| * | get_geometry now uses XML config object (for projections) | Wim van Aarle | 2015-02-26 | 10 | -1/+62 |
| | | |||||
| * | get_geometry now uses XML config object (for volumes) | Wim van Aarle | 2015-02-25 | 4 | -0/+18 |
| | | |||||
* | | Moved pthreads defines to Globals.h | Daan Pelt | 2015-02-25 | 2 | -3/+8 |
| | | |||||
* | | Remove CAsyncAlgorithm::timedJoin | Willem Jan Palenstijn | 2015-02-25 | 1 | -4/+0 |
|/ | | | | It is currently unused, and its current implementation is not very portable. | ||||
* | Update version | Willem Jan Palenstijn | 2015-01-30 | 1 | -2/+2 |
| | |||||
* | Update copyright to -2015 | Willem Jan Palenstijn | 2015-01-26 | 91 | -182/+182 |
| | |||||
* | Update copyright headers | Willem Jan Palenstijn | 2015-01-19 | 91 | -455/+455 |
| | |||||
* | Implement loading geometries into Projector3D | Willem Jan Palenstijn | 2014-12-08 | 1 | -2/+2 |
| | |||||
* | Add ProjectionGeometry3D::projectPoint for par3d and cone. | Willem Jan Palenstijn | 2014-12-02 | 5 | -2/+30 |
| | | | | Par3d_vec and cone_vec to follow. |