summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-26157-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-fixWillem Jan Palenstijn2015-05-261-7/+14
| |\ | | | | | | Hold reference to results of six.b calls
| | * Hold reference to results of six.b callsDaan Pelt2015-05-181-7/+14
| | |
| * | Merge pull request #66 from dmpelt/fix-old-sixWillem Jan Palenstijn2015-05-263-3/+18
| |\ \ | | | | | | | | Fix range import for old six versions
| | * | Fix range import for old six versionsDaniel M. Pelt2015-05-183-3/+18
| | | |
| * | | Fix Python samples for updated interface and old six versionsDaniel M. Pelt2015-05-262-4/+12
| | | |
| * | | Add note about autogen.shWillem Jan Palenstijn2015-05-202-0/+2
| |/ /
| * | Merge pull request #63 from wjp/optomo_sampleWillem Jan Palenstijn2015-05-151-0/+61
| |\ \ | | | | | | | | Create python sample for OpTomo
| | * | Create python sample for OpTomoWillem Jan Palenstijn2015-05-151-0/+61
| | | |
| * | | Merge pull request #49 from 3cHeLoN/astra-spotWillem Jan Palenstijn2015-05-153-0/+371
| |\ \ \ | | |/ / | |/| | Astra spot
| | * | Add copyright headerWillem Jan Palenstijn2015-05-151-0/+10
| | | |
| | * | Add note about Spot to sample scriptWillem Jan Palenstijn2015-05-151-0/+8
| | | |
| | * | Added ASTRA-Spot operator opTomoFolkert Bleichrodt2015-05-153-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.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 pull request #30 from dmpelt/loggingWillem Jan Palenstijn2015-03-2054-209/+2827
| |\ | | | | | | New logging API
| | * Use FlushFileBuffers in WindowsWillem Jan Palenstijn2015-03-201-1/+8
| | |
| | * Fix indentationWillem Jan Palenstijn2015-03-202-103/+103
| | |
| | * Fix commentWillem Jan Palenstijn2015-03-201-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 10:45:39 +0000