summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Fix commentsWillem Jan Palenstijn2015-07-231-5/+5
| | * | Reduce code duplicationWillem Jan Palenstijn2015-07-231-8/+5
| * | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-12-0216-64/+50
| |\ \ \ | | | |/ | | |/|
| | * | Fix whitespaceWillem Jan Palenstijn2015-10-094-8/+8
| | * | Improve option passing through CudaProjector2DWillem Jan Palenstijn2015-10-0910-60/+35
| | * | Improve option passing through CudaProjector3DWillem Jan Palenstijn2015-10-096-0/+11
| * | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-09-167-43/+75
| |\| |
| | * | Merge pull request #75 from wjp/cuda_optionsWillem Jan Palenstijn2015-06-262-1/+10
| | |\ \ | | | |/ | | |/|
| | | * Add supersampling options to Cuda ProjectorsWillem Jan Palenstijn2015-05-222-1/+10
| | * | Increment version to 1.6Willem Jan Palenstijn2015-05-291-2/+2
| | |/
| * | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-04-157-72/+912
| |\ \
| * | | Add 3d geometry normalization functionsWillem Jan Palenstijn2015-03-061-0/+53
* | | | some marginal gains + added documentationWim van Aarle2015-05-275-294/+509
* | | | Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-2615-169/+1032
|\ \ \ \ | | |_|/ | |/| |
| * | | Make XML array handling consistentWillem Jan Palenstijn2015-05-061-8/+27
| * | | Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-064-33/+35
| * | | Fix memory leak in the configJeroen BĂ©dorf2015-04-301-0/+2
| | |/ | |/|
| * | Merge pull request #52 from wjp/change_geometry3dWillem Jan Palenstijn2015-04-142-0/+10
| |\ \
| | * | Add changeGeometry function to Data3D classesWillem Jan Palenstijn2015-04-102-0/+10
| * | | Add 'link' feature to Python (for 2D and 3D data)Daniel M. Pelt2015-04-092-0/+50
| |/ /
| * | Use FlushFileBuffers in WindowsWillem Jan Palenstijn2015-03-201-1/+8
| * | Fix windows buildWillem Jan Palenstijn2015-03-192-1/+14
| * | Use a less verbose default fmt for screen logging and cleaner messagesDaniel M. Pelt2015-03-131-4/+4
| * | Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-132-1/+61
| * | Adds ASTRA_*** defines for easier logging, and changes internal calls to thes...Daniel M. Pelt2015-03-131-1/+4
| * | Adds new logging capabilities (based on clog.h)Daniel M. Pelt2015-03-102-0/+769
| * | Remove old Logging code (only used in fft.cu)Daniel M. Pelt2015-03-091-72/+0
| |/
* | removed extraDetectorOffsetWim van Aarle2015-03-131-13/+0
* | updated 'line_fanflat' projectorWim van Aarle2015-03-122-180/+140
* | updated 'blob' kernel projectorWim van Aarle2015-03-122-152/+122
* | parallel projectors now always use vector geometries internallyWim van Aarle2015-03-127-752/+99
* | updated 'strip' kernel projectorWim van Aarle2015-03-112-7/+197
* | updated 'linear' kernal projectorWim van Aarle2015-03-062-5/+138
* | 'line' kernel optimizationsWim van Aarle2015-03-061-30/+43
* | updated 'line' kernel projectorWim van Aarle2015-03-052-3/+206
* | created parallel_vec geometry classWim van Aarle2015-03-032-0/+175
|/
* Untangle cuda and astra includesWillem Jan Palenstijn2015-03-025-6/+123
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2714-41/+98
|\
| * code cleanupWim van Aarle2015-02-261-1/+0
| * updated docsWim van Aarle2015-02-266-40/+19
| * get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-2610-1/+62
| * get_geometry now uses XML config object (for volumes)Wim van Aarle2015-02-254-0/+18
* | Moved pthreads defines to Globals.hDaan Pelt2015-02-252-3/+8
* | Remove CAsyncAlgorithm::timedJoinWillem Jan Palenstijn2015-02-251-4/+0
|/
* Update versionWillem Jan Palenstijn2015-01-301-2/+2
* Update copyright to -2015Willem Jan Palenstijn2015-01-2691-182/+182
* Update copyright headersWillem Jan Palenstijn2015-01-1991-455/+455
* Implement loading geometries into Projector3DWillem Jan Palenstijn2014-12-081-2/+2
* Add ProjectionGeometry3D::projectPoint for par3d and cone.Willem Jan Palenstijn2014-12-025-2/+30
* Fix whitespaceWillem Jan Palenstijn2014-12-024-53/+53