Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Remove (long) obsolete file | Willem Jan Palenstijn | 2016-01-05 | 1 | -124/+0 | |
| |/ | ||||||
| * | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 2 | -0/+135 | |
| |\ | | | | | | | Add support for Python algorithm plugins | |||||
| | * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 11 | -16/+1293 | |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | |||||
| | * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 1 | -15/+8 | |
| | | | | | | | | | | | | | | | | when running in Matlab | |||||
| | * | | Fix numpy lapack loading when running in Matlab | Daniel M. Pelt | 2015-07-23 | 1 | -0/+3 | |
| | | | | ||||||
| | * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 1 | -0/+139 | |
| | | | | ||||||
| * | | | Fix Windows builds of astra_mex_direct | Willem Jan Palenstijn | 2015-12-02 | 2 | -0/+20 | |
| | |/ | |/| | ||||||
| * | | astra_mex_direct: Don't initialize newly allocated mxArray | Nicola Vigano | 2015-10-09 | 1 | -2/+18 | |
| | | | | | | | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after. | |||||
| * | | Build astra_mex_direct in MSVC | Willem Jan Palenstijn | 2015-10-07 | 2 | -0/+918 | |
| | | | ||||||
| * | | Add astra_mex_direct('FP3D'/'BP3D', ...) | Willem Jan Palenstijn | 2015-10-07 | 1 | -0/+332 | |
| | | | ||||||
| * | | Use mxLogical instead of bool. | Willem Jan Palenstijn | 2015-09-17 | 2 | -3/+3 | |
| | | | | | | | | | | | | This should improve compatibility with Octave according to Christian Häggström. | |||||
| * | | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 2 | -5/+5 | |
| | | | ||||||
| * | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 2 | -5/+12 | |
| | | | ||||||
| * | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 1 | -1/+5 | |
| | | | ||||||
| * | | Fix matlab compilation without CUDA | Daniel M. Pelt | 2015-06-20 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge remote-tracking branch 'upstream/master' into parallel_vec | Wim van Aarle | 2015-05-26 | 31 | -1720/+3387 | |
|\| | | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp | |||||
| * | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -20/+2 | |
| | | | | | | | | setContent and getContent were using different XML formats previously. | |||||
| * | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 6 | -42/+36 | |
| | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | |||||
| * | Fix bug in astra_mex_data3d('create') zero-initialization | Willem Jan Palenstijn | 2015-04-15 | 1 | -1/+1 | |
| | | ||||||
| * | Add astra_mex_data3d('change_geometry', ...) | Willem Jan Palenstijn | 2015-04-10 | 1 | -1/+109 | |
| | | ||||||
| * | Check input to mex_data3d/link is single | Willem Jan Palenstijn | 2015-04-10 | 1 | -2/+2 | |
| | | ||||||
| * | Fix indentation | Willem Jan Palenstijn | 2015-03-20 | 1 | -92/+92 | |
| | | ||||||
| * | Fix comment | Willem Jan Palenstijn | 2015-03-20 | 1 | -2/+2 | |
| | | ||||||
| * | Add MSVC project files | Willem Jan Palenstijn | 2015-03-20 | 16 | -0/+988 | |
| | | ||||||
| * | Merge branch 'master' into logging | Willem Jan Palenstijn | 2015-03-20 | 14 | -1660/+1896 | |
| |\ | ||||||
| | * | Generate MSVC 2008/2012 project files with a Python script | Willem Jan Palenstijn | 2015-03-19 | 14 | -1660/+1896 | |
| | | | ||||||
| * | | Enable logging to Matlab window using callback function | Daniel M. Pelt | 2015-03-13 | 11 | -0/+57 | |
| | | | | | | | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method. | |||||
| * | | Add logging support to Matlab | Daniel M. Pelt | 2015-03-13 | 1 | -0/+302 | |
| |/ | ||||||
* / | created parallel_vec geometry class | Wim van Aarle | 2015-03-03 | 1 | -0/+5 | |
|/ | ||||||
* | Merge pull request #20 from wvaarle/matlab-get-geometry | Willem Jan Palenstijn | 2015-02-27 | 11 | -623/+407 | |
|\ | | | | | 'get_geometry' functions in the matlab layer | |||||
| * | code cleanup | Wim van Aarle | 2015-02-26 | 11 | -518/+288 | |
| | | ||||||
| * | get_geometry now uses XML config object (for projections) | Wim van Aarle | 2015-02-26 | 6 | -266/+96 | |
| | | ||||||
| * | get_geometry now uses XML config object (for volumes) | Wim van Aarle | 2015-02-25 | 4 | -38/+80 | |
| | | ||||||
| * | re-enabled get_geometry for 3d projectors | Wim van Aarle | 2015-02-24 | 1 | -8/+8 | |
| | | ||||||
| * | added get_geometry for 3d projection data objects | Wim van Aarle | 2015-02-24 | 3 | -10/+123 | |
| | | ||||||
| * | fixed get_geometry for fanflat_vec | Wim van Aarle | 2015-02-24 | 2 | -35/+41 | |
| | | ||||||
| * | added get_geometry for 3d volume objects | Wim van Aarle | 2015-02-24 | 3 | -53/+76 | |
| | | ||||||
* | | Fix include order | Willem Jan Palenstijn | 2015-02-26 | 1 | -1/+1 | |
| | | ||||||
* | | Moved pthreads defines to Globals.h | Daan Pelt | 2015-02-25 | 1 | -1/+1 | |
|/ | ||||||
* | Added support for logical matrices in mex_data3d | Wim van Aarle | 2015-02-24 | 5 | -23/+53 | |
| | | | | | Did not accelerate using sse2, as no intrinsics exist to convert 8-bit to 32-bit. | |||||
* | Update copyright to -2015 | Willem Jan Palenstijn | 2015-01-26 | 10 | -20/+20 | |
| | ||||||
* | Update copyright headers | Willem Jan Palenstijn | 2015-01-19 | 10 | -50/+50 | |
| | ||||||
* | Implement loading geometries into Projector3D | Willem Jan Palenstijn | 2014-12-08 | 1 | -1/+1 | |
| | ||||||
* | Remove unused stubs from mex_data3d | Willem Jan Palenstijn | 2014-12-05 | 1 | -430/+2 | |
| | ||||||
* | Add VS2012 build files | Willem Jan Palenstijn | 2014-12-04 | 8 | -0/+2316 | |
| | ||||||
* | Refactor astra_mex_data3d | Willem Jan Palenstijn | 2014-12-04 | 5 | -492/+822 | |
| | | | | (Modified) patch by Nicola Viganò | |||||
* | Avoid mxIsSharedArray | Willem Jan Palenstijn | 2014-11-24 | 1 | -0/+6 | |
| | | | | Matlab R2014b no longer seems to support it. | |||||
* | Verify data is not sparse in astra_mex_data2d | Willem Jan Palenstijn | 2014-07-23 | 1 | -0/+8 | |
| | ||||||
* | Fix geometry memory leak in astra_mex_data3d create/link | Willem Jan Palenstijn | 2014-05-02 | 1 | -2/+3 | |
| | ||||||
* | Add SIRT-Weighted BP3D (par3d-only) for use in large BP | Willem Jan Palenstijn | 2014-05-02 | 1 | -0/+4 | |
| |