summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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 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 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 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 OpTomoWillem Jan Palenstijn2015-05-151-0/+61
| * | | Merge pull request #49 from 3cHeLoN/astra-spotWillem Jan Palenstijn2015-05-153-0/+371
| |\ \ \ | | |/ / | |/| |