summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master'Willem Jan Palenstijn2015-06-2611-18/+82
|\
| * Merge pull request #76 from dmpelt/projector-configuration-fixWillem Jan Palenstijn2015-06-267-11/+42
| |\ | | | | | | Configuration fixes
| | * Fix memory leak in configuration codeDaniel M. Pelt2015-06-254-9/+28
| | |
| | * Add extra null check for ExtraDetectorOffsetDaniel M. Pelt2015-06-251-3/+5
| | |
| | * Include ExtraDetectorOffset in returned configurationDaniel M. Pelt2015-06-241-0/+3
| | |
| | * Fix config to struct/dict translation for array optionsDaniel M. Pelt2015-06-242-2/+9
| |/
| * Add some common temporary file patterns to .gitignore.Willem Jan Palenstijn2015-06-231-22/+30
| | | | | | | | Also add leading slashes to full paths for consistency.
| * Merge pull request #74 from dmpelt/small-fixesWillem Jan Palenstijn2015-06-234-5/+28
| |\ | | | | | | Small fixes
| | * Additional module name fix in documentationDaniel M. Pelt2015-06-221-1/+1
| | |
| | * Add a .gitignore to ignore build filesDaniel M. Pelt2015-06-201-0/+23
| | |
| | * Actually use the rec_type argument in astra_create_reconstruction_cudaDaniel M. Pelt2015-06-201-1/+1
| | |
| | * Fix matlab compilation without CUDADaniel M. Pelt2015-06-201-2/+2
| | |
| | * Fix wrong module name in documentationDaniel M. Pelt2015-06-201-1/+1
| | |
| * | Don't take address of temporary.Valerii Sokolov2015-06-221-2/+4
| |/
* | Merge branch 'master'Willem Jan Palenstijn2015-05-2915-315/+509
|\|
| * Increment version to 1.6Willem Jan Palenstijn2015-05-292-3/+3
| |
| * Fix vs2008 buildWillem Jan Palenstijn2015-05-292-10/+19
| |
| * Update utility filesWillem Jan Palenstijn2015-05-293-287/+438
| |
| * Update README, NEWSWillem Jan Palenstijn2015-05-294-4/+16
| |
| * Fix optomo reconstruction for 1D inputDaniel M. Pelt2015-05-261-1/+1
| |
| * 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 #7 from dmpelt/masterWillem Jan Palenstijn2015-05-262-4/+12
|\ \ \ | | | | | | | | Fix Python samples for updated interface and old six versions
| * | | 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 branch 'master'Willem Jan Palenstijn2015-05-154-0/+432
|\| |
| * | 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.
* | | | 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 07:37:40 +0000