Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' | Willem Jan Palenstijn | 2015-09-16 | 22 | -85/+231 |
|\ | |||||
| * | Silence bogus warning: | Christian Häggström | 2015-09-16 | 1 | -0/+1 |
| * | Merge pull request #90 from wjp/opTomo_leak | Willem Jan Palenstijn | 2015-09-09 | 1 | -0/+2 |
| |\ | |||||
| | * | Fix algorithm leak in opTomo | Willem Jan Palenstijn | 2015-09-04 | 1 | -0/+2 |
| |/ | |||||
| * | Fix algorithm object leak in astra_create_fbp_reconstruction.m | Willem Jan Palenstijn | 2015-08-12 | 1 | -0/+1 |
| * | Merge pull request #88 from dmpelt/nogil | Willem Jan Palenstijn | 2015-08-11 | 2 | -2/+4 |
| |\ | |||||
| | * | Release the gil in algorithm.run | Daniel M. Pelt | 2015-08-10 | 2 | -2/+4 |
| |/ | |||||
| * | Merge pull request #86 from dmpelt/scipy-0.16-optomo-fix | Willem Jan Palenstijn | 2015-08-03 | 1 | -1/+17 |
| |\ | |||||
| | * | Define a transpose for the OpTomo transpose as well | Daniel M. Pelt | 2015-07-30 | 1 | -0/+8 |
| | * | Fix Python OpTomo for scipy 0.16 | Daniel M. Pelt | 2015-07-30 | 1 | -1/+9 |
| |/ | |||||
| * | Merge pull request #84 from dmpelt/log-highlevel-fix | Willem Jan Palenstijn | 2015-07-17 | 3 | -9/+9 |
| |\ | |||||
| | * | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 3 | -9/+9 |
| |/ | |||||
| * | Merge pull request #75 from wjp/cuda_options | Willem Jan Palenstijn | 2015-06-26 | 14 | -73/+197 |
| |\ | |||||
| | * | Update sample | Willem Jan Palenstijn | 2015-06-23 | 1 | -18/+10 |
| | * | Use supersampling options from CudaProjector2D | Willem Jan Palenstijn | 2015-06-23 | 3 | -36/+73 |
| | * | Use supersampling options from CudaProjector3D | Willem Jan Palenstijn | 2015-06-04 | 6 | -18/+88 |
| | * | Add supersampling options to Cuda Projectors | Willem Jan Palenstijn | 2015-05-22 | 4 | -1/+26 |
* | | | Merge branch 'master' | Willem Jan Palenstijn | 2015-06-26 | 11 | -18/+82 |
|\| | | |||||
| * | | Merge pull request #76 from dmpelt/projector-configuration-fix | Willem Jan Palenstijn | 2015-06-26 | 7 | -11/+42 |
| |\ \ | |||||
| | * | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 4 | -9/+28 |
| | * | | Add extra null check for ExtraDetectorOffset | Daniel M. Pelt | 2015-06-25 | 1 | -3/+5 |
| | * | | Include ExtraDetectorOffset in returned configuration | Daniel M. Pelt | 2015-06-24 | 1 | -0/+3 |
| | * | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 2 | -2/+9 |
| |/ / | |||||
| * | | Add some common temporary file patterns to .gitignore. | Willem Jan Palenstijn | 2015-06-23 | 1 | -22/+30 |
| * | | Merge pull request #74 from dmpelt/small-fixes | Willem Jan Palenstijn | 2015-06-23 | 4 | -5/+28 |
| |\ \ | |||||
| | * | | Additional module name fix in documentation | Daniel M. Pelt | 2015-06-22 | 1 | -1/+1 |
| | * | | Add a .gitignore to ignore build files | Daniel M. Pelt | 2015-06-20 | 1 | -0/+23 |
| | * | | Actually use the rec_type argument in astra_create_reconstruction_cuda | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 |
| | * | | Fix matlab compilation without CUDA | Daniel M. Pelt | 2015-06-20 | 1 | -2/+2 |
| | * | | Fix wrong module name in documentation | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 |
| * | | | Don't take address of temporary. | Valerii Sokolov | 2015-06-22 | 1 | -2/+4 |
| |/ / | |||||
* | | | Merge branch 'master' | Willem Jan Palenstijn | 2015-05-29 | 15 | -315/+509 |
|\| | | |||||
| * | | Increment version to 1.6 | Willem Jan Palenstijn | 2015-05-29 | 2 | -3/+3 |
| * | | Fix vs2008 build | Willem Jan Palenstijn | 2015-05-29 | 2 | -10/+19 |
| * | | Update utility files | Willem Jan Palenstijn | 2015-05-29 | 3 | -287/+438 |
| * | | Update README, NEWS | Willem Jan Palenstijn | 2015-05-29 | 4 | -4/+16 |
| * | | Fix optomo reconstruction for 1D input | Daniel M. Pelt | 2015-05-26 | 1 | -1/+1 |
| * | | Merge pull request #65 from dmpelt/cython-char-fix | Willem Jan Palenstijn | 2015-05-26 | 1 | -7/+14 |
| |\ \ | |||||
| | * | | Hold reference to results of six.b calls | Daan Pelt | 2015-05-18 | 1 | -7/+14 |
| * | | | Merge pull request #66 from dmpelt/fix-old-six | Willem Jan Palenstijn | 2015-05-26 | 3 | -3/+18 |
| |\ \ \ | |||||
| | * | | | Fix range import for old six versions | Daniel M. Pelt | 2015-05-18 | 3 | -3/+18 |
| * | | | | Fix Python samples for updated interface and old six versions | Daniel M. Pelt | 2015-05-26 | 2 | -4/+12 |
| | |_|/ | |/| | | |||||
| * | | | Add note about autogen.sh | Willem Jan Palenstijn | 2015-05-20 | 2 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #7 from dmpelt/master | Willem Jan Palenstijn | 2015-05-26 | 2 | -4/+12 |
|\ \ \ | |||||
| * | | | Fix Python samples for updated interface and old six versions | Daniel M. Pelt | 2015-05-26 | 2 | -4/+12 |
|/ / / | |||||
* | | | Add note about autogen.sh | Willem Jan Palenstijn | 2015-05-20 | 2 | -0/+2 |
* | | | Merge branch 'master' | Willem Jan Palenstijn | 2015-05-15 | 4 | -0/+432 |
|\| | | |||||
| * | | Merge pull request #63 from wjp/optomo_sample | Willem Jan Palenstijn | 2015-05-15 | 1 | -0/+61 |
| |\ \ | |||||
| | * | | Create python sample for OpTomo | Willem Jan Palenstijn | 2015-05-15 | 1 | -0/+61 |
| * | | | Merge pull request #49 from 3cHeLoN/astra-spot | Willem Jan Palenstijn | 2015-05-15 | 3 | -0/+371 |
| |\ \ \ | | |/ / | |/| | |