summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-12-0216-281/+298
|\
| * Merge pull request #94 from wjp/cuda_options2Willem Jan Palenstijn2015-12-0116-281/+298
| |\ | | | | | | Improve option passing via CudaProjector(2D/3D)
| | * Fix warning textWillem Jan Palenstijn2015-10-091-3/+3
| | |
| | * Improve option passing through CudaProjector2DWillem Jan Palenstijn2015-10-0910-208/+134
| | | | | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector2D. Also refactor CudaReconstructionAlgorithm::initialize/check to avoid code duplication with ReconstructionAlgorithm.
| | * Improve option passing through CudaProjector3DWillem Jan Palenstijn2015-10-096-70/+161
| | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector3D. Thanks to Nicola Vigano for part of the patch.
* | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-11-185-41/+80
|\| |
| * | 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.
| | * | Give a warning on ignored Min/MaxContraint in some CUDA algorithms.Willem Jan Palenstijn2015-10-091-4/+12
| | | | | | | | | | | | | | | | Previously it would fail an assertion.
| * | | 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 file
| | * | 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
| | | | | | | | | | | | | | | | This would cause crashes when specifying invalid data.
| * | | Fix loop bounds in (unused) Float32ProjectionData3D arithmetic functionsWillem Jan Palenstijn2015-10-091-16/+20
| | |/ | |/|
| * | Silence bogus warning:Christian Häggström2015-09-161-0/+1
| |/ | | | | | | Warning: CudaSirtAlgorithm3D: unused configuration options: SinogramMaskId
* | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-09-1642-602/+653
|\| | | | | | | | | Conflicts: src/CudaBackProjectionAlgorithm3D.cpp
| * Merge pull request #75 from wjp/cuda_optionsWillem Jan Palenstijn2015-06-2611-54/+177
| |\ | | | | | | Move supersampling options from Algorithm to CudaProjector
| | * 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-222-0/+16
| | |
| * | Add extra null check for ExtraDetectorOffsetDaniel M. Pelt2015-06-251-3/+5
| | |
| * | Include ExtraDetectorOffset in returned configurationDaniel M. Pelt2015-06-241-0/+3
| |/
| * Make XML array handling consistentWillem Jan Palenstijn2015-05-061-63/+87
| | | | | | | | setContent and getContent were using different XML formats previously.
| * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-0642-506/+410
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
| * Fix memory leak in the configJeroen Bédorf2015-04-301-0/+5
| |
| * Now include path is system-independent.Valerii Sokolov2015-04-292-10/+0
| |
* | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-04-1514-92/+272
|\|
| * Merge pull request #52 from wjp/change_geometry3dWillem Jan Palenstijn2015-04-142-0/+18
| |\ | | | | | | Add data3d('change_geometry')
| | * Add changeGeometry function to Data3D classesWillem Jan Palenstijn2015-04-102-0/+18
| | |
| * | Add 'link' feature to Python (for 2D and 3D data)Daniel M. Pelt2015-04-092-0/+39
| |/
| * Fix typo in error messageWillem Jan Palenstijn2015-03-301-1/+1
| |
| * Add missing error on wrong projgeom type in CProjector3D::initializeWillem Jan Palenstijn2015-03-301-0/+1
| |
| * Only allow stdout and stderr for screen loggingDaniel M. Pelt2015-03-131-1/+5
| |
| * Use a less verbose default fmt for screen logging and cleaner messagesDaniel M. Pelt2015-03-134-3/+4
| |
| * Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-131-2/+6
| | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method.
| * Adds ASTRA_*** defines for easier logging, and changes internal calls to ↵Daniel M. Pelt2015-03-137-7/+7
| | | | | | | | these defines
| * Use new logging API internally instead of printf / iostreamDaniel M. Pelt2015-03-107-7/+24
| |
| * Adds new logging capabilities (based on clog.h)Daniel M. Pelt2015-03-101-0/+175
| |
| * Remove old Logging code (only used in fft.cu)Daniel M. Pelt2015-03-092-85/+6
| |
* | Add flexible volgeom3d support to astraCudaFPWillem Jan Palenstijn2015-03-121-56/+3
| |
* | Add flexible volgeom3d support to astraCudaBPWillem Jan Palenstijn2015-03-111-51/+3
| |
* | Add flexible volgeom3d support to astraCudaBP_SIRTWeightedWillem Jan Palenstijn2015-03-111-59/+28
| |
* | Let astraCudaFDK use utility functionsWillem Jan Palenstijn2015-03-111-11/+1
| |
* | Allow non-centered volume geometry in SIRT3D and CGLS3DWillem Jan Palenstijn2015-03-092-75/+2
|/
* Fix getConfiguration type for vec geometriesWillem Jan Palenstijn2015-03-032-2/+2
|
* Fix getConfiguration for vec geometries and non-square detectorsWillem Jan Palenstijn2015-03-032-6/+6
|
* Untangle cuda and astra includesWillem Jan Palenstijn2015-03-021-0/+75
|
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2713-38/+219
|\ | | | | 'get_geometry' functions in the matlab layer
| * updated docsWim van Aarle2015-02-264-43/+0
| |
| * get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-269-7/+170
| |
| * get_geometry now uses XML config object (for volumes)Wim van Aarle2015-02-254-1/+62
| |
| * re-enabled get_geometry for 3d projectorsWim van Aarle2015-02-242-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 14:37:42 +0000