summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master'Willem Jan Palenstijn2015-05-1387-934/+1389
|\
| * Sync README.txt with README.mdWillem Jan Palenstijn2015-05-131-3/+6
| |
| * Add DOI link for JSB paper as wellWillem Jan Palenstijn2015-05-131-1/+1
| |
| * Update README.mdWim van Aarle2015-05-131-2/+7
| | | | | | updated references
| * fix memleaks in testjoergkappes2015-05-082-0/+10
| |
| * fix to small memory allocationjoergkappes2015-05-081-2/+2
| |
| * Merge pull request #61 from wjp/xmlnode_cleanupWillem Jan Palenstijn2015-05-0856-730/+639
| |\ | | | | | | Clean up XMLNode
| | * Make XML array handling consistentWillem Jan Palenstijn2015-05-065-117/+127
| | | | | | | | | | | | setContent and getContent were using different XML formats previously.
| | * Add extra XMLNode/XMLDocument/Config testWillem Jan Palenstijn2015-05-061-0/+16
| | |
| | * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-0656-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-pythonWillem Jan Palenstijn2015-05-085-139/+201
| |\ \ | | | | | | | | Add SPOT-like object for Python (overrides `__mul__` and works with scipy.sparse.linalg)
| | * | Rename optomo.py for Python 2 supportDaniel M. Pelt2015-05-082-1/+1
| | | |
| | * | Use superclass __mul__ in Python OpTomo __mul__Daniel M. Pelt2015-05-071-22/+11
| | | |
| | * | Add SPOT-like object for Python (overrides `__mul__` and works with ↵Daan Pelt2015-05-045-139/+212
| | |/ | | | | | | | | | scipy.sparse.linalg)
| * | Merge pull request #58 from dmpelt/python-link-size-checkWillem Jan Palenstijn2015-05-084-23/+86
| |\ \ | | |/ | |/| Check data size when using 'link' function in Python
| | * Do not allow 1D input in Python link methodDaniel M. Pelt2015-05-072-16/+4
| | |
| | * Check data size when using 'link' function in PythonDaan Pelt2015-04-304-23/+98
| | |
| * | Fix memory leak in the configJeroen Bédorf2015-04-302-0/+7
| |/
| * Merge pull request #57 from valeriysokolov/fix-rapidxml-includesWillem Jan Palenstijn2015-04-293-11/+1
| |\ | | | | | | Now include path is system-independent.
| | * Now include path is system-independent.Valerii Sokolov2015-04-293-11/+1
| |/
| * Fix typo in configure python checkWillem Jan Palenstijn2015-04-161-1/+1
| |
| * Fix bug in astra_mex_data3d('create') zero-initializationWillem Jan Palenstijn2015-04-151-1/+1
| |
| * Merge pull request #52 from wjp/change_geometry3dWillem Jan Palenstijn2015-04-148-1/+218
| |\ | | | | | | Add data3d('change_geometry')
| | * Add python data3d.change_geometryWillem Jan Palenstijn2015-04-103-0/+81
| | |
| | * Add astra_mex_data3d('change_geometry', ...)Willem Jan Palenstijn2015-04-101-1/+109
| | |
| | * Add changeGeometry function to Data3D classesWillem Jan Palenstijn2015-04-104-0/+28
| | |
| * | Merge pull request #51 from dmpelt/python-linkWillem Jan Palenstijn2015-04-1410-9/+196
| |\ \ | | |/ | |/| Add 'link' feature to Python (for 2D and 3D data)
| | * Add 'link' feature to Python (for 2D and 3D data)Daniel M. Pelt2015-04-0910-9/+196
| | |
| * | Check input to mex_data3d/link is singleWillem Jan Palenstijn2015-04-101-2/+2
| | |
| * | Merge pull request #50 from valeriysokolov/fix-dart-smoothingWillem Jan Palenstijn2015-04-091-6/+7
| |\ \ | | |/ | |/| Fixed a few CUDA 2D DART bugs.
| | * Fixed a few CUDA 2D DART bugs.Valerii Sokolov2015-04-091-6/+7
| |/ | | | | | | | | * Mixed width and height led to incorrect work on rectangular images. * Incorrect weight calculation in `devDartSmoothingRadius` (#47).
| * Initialize variables to avoid warningWillem Jan Palenstijn2015-03-303-3/+3
| | | | | | | | | | These variables are never used when uninitialized, but Visual Studio complains about them.
| * Fix typo in error messageWillem Jan Palenstijn2015-03-301-1/+1
| |
| * Add missing error on wrong projgeom type in CProjector3D::initializeWillem Jan Palenstijn2015-03-301-0/+1
| |
* | Merge branch 'master'Willem Jan Palenstijn2015-03-250-0/+0
|\ \ | |/ |/|
| * Update versionWillem Jan Palenstijn2015-01-302-3/+3
| |
| * Update NEWSWillem Jan Palenstijn2015-01-301-3/+5
| |
| * Add VS2012 build filesWillem Jan Palenstijn2015-01-2611-0/+3673
| |
| * Update copyright to -2015Willem Jan Palenstijn2015-01-26299-598/+598
| |
| * Sync DART versionWillem Jan Palenstijn2015-01-2322-1303/+680
| |
| * Make astra_clear clear projector3d tooWillem Jan Palenstijn2015-01-231-0/+1
| |
| * Store result of nvcc tests in config.logWillem Jan Palenstijn2015-01-231-2/+23
| |
| * Silence bogus warning:Christian Häggström2015-01-201-0/+1
| | | | | | | | Warning: CudaSirtAlgorithm3D: unused configuration options: SinogramMaskId
| * Remove unused filesWillem Jan Palenstijn2015-01-194-417/+0
| |
| * Remove unused stubs from mex_data3dWillem Jan Palenstijn2015-01-191-430/+2
| |
| * Refactor astra_mex_data3dWillem Jan Palenstijn2015-01-196-493/+827
| | | | | | | | (Modified) patch by Nicola Viganò
| * Fix whitespaceWillem Jan Palenstijn2015-01-194-53/+53
| |
| * Remove unused DetectorOffsetX/Y in ProjectionGeometry3DWillem Jan Palenstijn2015-01-194-192/+13
| |
| * Add CUDA SIRT::doSlabCorrections() functionWillem Jan Palenstijn2015-01-194-0/+59
| | | | | | | | | | This function optionally compensates for effectively infinitely large slab-like objects of finite thickness 1.
| * Improve cuda 2d header commentsWillem Jan Palenstijn2015-01-192-1/+25
| |