summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Update version to 1.7Willem Jan Palenstijn2015-12-041-2/+2
|
* Merge pull request #101 from wjp/compositeWillem Jan Palenstijn2015-12-047-10/+220
|\ | | | | Add CompositeGeometryManager
| * Add utility functions for creating FP/BP JobListsWillem Jan Palenstijn2015-12-041-0/+2
| |
| * Add CompositeGeometryManagerWillem Jan Palenstijn2015-12-047-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-pluginsWillem Jan Palenstijn2015-12-043-13/+134
|\ \ | |/ |/| Add support for Python algorithm plugins
| * Fix Windows buildWillem Jan Palenstijn2015-12-021-1/+1
| |
| * Avoid unnecessary include in headerWillem Jan Palenstijn2015-12-021-3/+6
| |
| * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-0116-65/+60
| |\ | | | | | | | | | | | | Conflicts: python/astra/utils.pyx
| * | Allow registering plugins without explicit name, and fix exception handling ↵Daniel M. Pelt2015-07-231-0/+3
| | | | | | | | | | | | when running in Matlab
| * | Fix numpy lapack loading when running in MatlabDaniel M. Pelt2015-07-231-0/+2
| | |
| * | Remove config text file loading for pluginsDaniel M. Pelt2015-07-231-2/+1
| | |
| * | Add support for Python algorithm pluginsDaniel M. Pelt2015-07-232-0/+98
| | |
| * | Add hooks for plugin support to AstraObjectFactoryWillem Jan Palenstijn2015-07-231-0/+19
| | | | | | | | | | | | | | | To use these hooks, add a specialization of findPlugin for the desired type of object (e.g., Algorithms).
| * | Fix commentsWillem Jan Palenstijn2015-07-231-5/+5
| | |
| * | Reduce code duplicationWillem Jan Palenstijn2015-07-231-8/+5
| | |
* | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-12-0216-64/+50
|\ \ \ | | |/ | |/|
| * | Fix whitespaceWillem Jan Palenstijn2015-10-094-8/+8
| | |
| * | Improve option passing through CudaProjector2DWillem Jan Palenstijn2015-10-0910-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 CudaProjector3DWillem Jan Palenstijn2015-10-096-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 volgeom3dWillem Jan Palenstijn2015-09-167-43/+75
|\| | | | | | | | | | | | | | Conflicts: src/CudaBackProjectionAlgorithm3D.cpp
| * | Merge pull request #75 from wjp/cuda_optionsWillem Jan Palenstijn2015-06-262-1/+10
| |\ \ | | |/ | |/| Move supersampling options from Algorithm to CudaProjector
| | * Add supersampling options to Cuda ProjectorsWillem Jan Palenstijn2015-05-222-1/+10
| | |
| * | Increment version to 1.6Willem Jan Palenstijn2015-05-291-2/+2
| |/
| * Make XML array handling consistentWillem Jan Palenstijn2015-05-061-8/+27
| | | | | | | | setContent and getContent were using different XML formats previously.
| * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-064-33/+35
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
| * Fix memory leak in the configJeroen Bédorf2015-04-301-0/+2
| |
* | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-04-157-72/+912
|\|
| * Merge pull request #52 from wjp/change_geometry3dWillem Jan Palenstijn2015-04-142-0/+10
| |\ | | | | | | Add data3d('change_geometry')
| | * Add changeGeometry function to Data3D classesWillem Jan Palenstijn2015-04-102-0/+10
| | |
| * | Add 'link' feature to Python (for 2D and 3D data)Daniel M. Pelt2015-04-092-0/+50
| |/
| * Use FlushFileBuffers in WindowsWillem Jan Palenstijn2015-03-201-1/+8
| |
| * Fix windows buildWillem Jan Palenstijn2015-03-192-1/+14
| |
| * Use a less verbose default fmt for screen logging and cleaner messagesDaniel M. Pelt2015-03-131-4/+4
| |
| * Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-132-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. Pelt2015-03-131-1/+4
| | | | | | | | these defines
| * Adds new logging capabilities (based on clog.h)Daniel M. Pelt2015-03-102-0/+769
| |
| * Remove old Logging code (only used in fft.cu)Daniel M. Pelt2015-03-091-72/+0
| |
* | Add 3d geometry normalization functionsWillem Jan Palenstijn2015-03-061-0/+53
|/
* Untangle cuda and astra includesWillem Jan Palenstijn2015-03-025-6/+123
|
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2714-41/+98
|\ | | | | 'get_geometry' functions in the matlab layer
| * code cleanupWim van Aarle2015-02-261-1/+0
| |
| * updated docsWim van Aarle2015-02-266-40/+19
| |
| * get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-2610-1/+62
| |
| * get_geometry now uses XML config object (for volumes)Wim van Aarle2015-02-254-0/+18
| |
* | Moved pthreads defines to Globals.hDaan Pelt2015-02-252-3/+8
| |
* | Remove CAsyncAlgorithm::timedJoinWillem Jan Palenstijn2015-02-251-4/+0
|/ | | | It is currently unused, and its current implementation is not very portable.
* Update versionWillem Jan Palenstijn2015-01-301-2/+2
|
* Update copyright to -2015Willem Jan Palenstijn2015-01-2691-182/+182
|
* Update copyright headersWillem Jan Palenstijn2015-01-1991-455/+455
|
* Implement loading geometries into Projector3DWillem Jan Palenstijn2014-12-081-2/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 14:38:16 +0000