summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | 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
* | | | | | 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
| |\ \ \ \ \
| | * | | | | 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
| * | | | | Merge pull request #74 from dmpelt/small-fixesWillem Jan Palenstijn2015-06-234-5/+28
| |\ \ \ \ \
| | * | | | | 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