summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Fix warning textWillem Jan Palenstijn2015-10-091-3/+3
| | * | | Fix whitespaceWillem Jan Palenstijn2015-10-094-8/+8
| | * | | Improve option passing through CudaProjector2DWillem Jan Palenstijn2015-10-0920-268/+169
| | * | | Improve option passing through CudaProjector3DWillem Jan Palenstijn2015-10-0912-70/+172
| | * | | Add options passing to projectors from matlabNicola Vigano2015-10-091-2/+7
| * | | | Merge pull request #95 from wjp/mex_directWillem Jan Palenstijn2015-12-018-3/+1349
| |\ \ \ \
| | * | | | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| | * | | | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-075-2/+975
| | * | | | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-073-1/+358
| | |/ / /
| | | * | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-11-188-44/+85
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #96 from wjp/cuda_constraint_warningWillem Jan Palenstijn2015-10-151-4/+12
| |\ \ \ \
| | * | | | Give a warning on ignored Min/MaxContraint in some CUDA algorithms.Willem Jan Palenstijn2015-10-091-4/+12
| * | | | | Merge pull request #97 from dmpelt/log_valist_fixWillem Jan Palenstijn2015-10-141-16/+44
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Do not reuse va_list when logging both to screen and fileDaniel M. Pelt2015-10-131-16/+44
| * | | | | Call check() function after initializing CUDA_FBPWillem Jan Palenstijn2015-10-091-5/+3
| * | | | | 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
| | | * | Let astra_create_vol_geom also generate flexible volume geometriesWillem Jan Palenstijn2015-09-252-0/+30
| | | * | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-09-16101-1304/+2196
| | | |\ \ | | | |/ / | | |/| |
| | | * | Fix assertWillem Jan Palenstijn2015-07-161-1/+1
| | | * | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-04-1591-5555/+10720
| | | |\ \
| | | * | | Add outputScale argument to 2D CUDA BPWillem Jan Palenstijn2015-03-1212-63/+76
| | | * | | Adapt standalone test programs to outputscaleWillem Jan Palenstijn2015-03-122-2/+2
| | | * | | Scale CUDA 3D FP/BP output with volume pixel sizeWillem Jan Palenstijn2015-03-125-37/+36
| | | * | | Add outputScale argument to 3D CUDA BPWillem Jan Palenstijn2015-03-129-38/+54
| | | * | | Add flexible volgeom3d support to astraCudaFPWillem Jan Palenstijn2015-03-123-273/+39
| | | * | | Add flexible volgeom3d support to astraCudaBPWillem Jan Palenstijn2015-03-113-253/+24
| | | * | | Add flexible volgeom3d support to astraCudaBP_SIRTWeightedWillem Jan Palenstijn2015-03-113-139/+66
| | | * | | Add another utility functionWillem Jan Palenstijn2015-03-111-46/+53
| | | * | | Let astraCudaFDK use utility functionsWillem Jan Palenstijn2015-03-113-44/+17
| | | * | | Adjust interface slightlyWillem Jan Palenstijn2015-03-111-11/+12
| | | * | | Allow non-centered volume geometry in SIRT3D and CGLS3DWillem Jan Palenstijn2015-03-094-361/+90
| | | * | | Add 3d geometry normalization functionsWillem Jan Palenstijn2015-03-063-0/+219
* | | | | | Merge branch 'master'Willem Jan Palenstijn2015-09-1622-85/+231
|\| | | | |
| * | | | | Silence bogus warning:Christian Häggström2015-09-161-0/+1
| * | | | | Merge pull request #90 from wjp/opTomo_leakWillem Jan Palenstijn2015-09-091-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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.runDaniel M. Pelt2015-08-102-2/+4
| |/ / / /
| * | | | Merge pull request #86 from dmpelt/scipy-0.16-optomo-fixWillem Jan Palenstijn2015-08-031-1/+17
| |\ \ \ \
| | * | | | Define a transpose for the OpTomo transpose as wellDaniel M. Pelt2015-07-301-0/+8
| | * | | | Fix Python OpTomo for scipy 0.16Daniel M. Pelt2015-07-301-1/+9
| |/ / / /
| * | | | 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 codeDaniel M. Pelt2015-07-173-9/+9
| |/ / / /
| * | | | Merge pull request #75 from wjp/cuda_optionsWillem Jan Palenstijn2015-06-2614-73/+197
| |\ \ \ \
| | * | | | 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