summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Give a warning on ignored Min/MaxContraint in some CUDA algorithms.Willem Jan Palenstijn2015-10-091-4/+12
| | | | Previously it would fail an assertion.
* Call check() function after initializing CUDA_FBPWillem Jan Palenstijn2015-10-091-5/+3
| | | | This would cause crashes when specifying invalid data.
* Fix loop bounds in (unused) Float32ProjectionData3D arithmetic functionsWillem Jan Palenstijn2015-10-091-16/+20
|
* Use mxLogical instead of bool.Willem Jan Palenstijn2015-09-172-3/+3
| | | | This should improve compatibility with Octave according to Christian Häggström.
* Silence bogus warning:Christian Häggström2015-09-161-0/+1
| | | | Warning: CudaSirtAlgorithm3D: unused configuration options: SinogramMaskId
* Merge pull request #90 from wjp/opTomo_leakWillem Jan Palenstijn2015-09-091-0/+2
|\ | | | | Fix algorithm leak in opTomo
| * Fix algorithm leak in opTomoWillem Jan Palenstijn2015-09-041-0/+2
|/
* Fix algorithm object leak in astra_create_fbp_reconstruction.mWillem Jan Palenstijn2015-08-121-0/+1
|
* Merge pull request #88 from dmpelt/nogilWillem Jan Palenstijn2015-08-112-2/+4
|\ | | | | Release the gil in algorithm.run
| * Release the gil in algorithm.runDaniel M. Pelt2015-08-102-2/+4
|/
* Merge pull request #86 from dmpelt/scipy-0.16-optomo-fixWillem Jan Palenstijn2015-08-031-1/+17
|\ | | | | Small OpTomo fixes
| * Define a transpose for the OpTomo transpose as wellDaniel M. Pelt2015-07-301-0/+8
| | | | | | | | Allows for chaining .T calls.
| * Fix Python OpTomo for scipy 0.16Daniel M. Pelt2015-07-301-1/+9
|/ | | | | | scipy 0.16 also uses .T to define a transpose, which conflicts with the old OpTomo implementation. OpTomo now also defines the _transpose() method, which .T will call in scipy 0.16.
* Merge pull request #84 from dmpelt/log-highlevel-fixWillem Jan Palenstijn2015-07-173-9/+9
|\ | | | | Fix formatting when passing strings to log from high-level code
| * Fix formatting when passing strings to log from high-level codeDaniel M. Pelt2015-07-173-9/+9
|/
* Merge pull request #75 from wjp/cuda_optionsWillem Jan Palenstijn2015-06-2614-73/+197
|\ | | | | Move supersampling options from Algorithm to CudaProjector
| * Update sampleWillem Jan Palenstijn2015-06-231-18/+10
| |
| * Use supersampling options from CudaProjector2DWillem Jan Palenstijn2015-06-233-36/+73
| |
| * Use supersampling options from CudaProjector3DWillem Jan Palenstijn2015-06-046-18/+88
| |
| * Add supersampling options to Cuda ProjectorsWillem Jan Palenstijn2015-05-224-1/+26
| |
* | 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
|/ /
* | 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 #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.