summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-2648-656/+758
|\ | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
| * 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 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
| |
| * 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
| |
* | corrected geometry namesWim van Aarle2015-03-182-8/+8
| |
* | removed extraDetectorOffsetWim van Aarle2015-03-132-20/+1
| |
* | updated 'line_fanflat' projectorWim van Aarle2015-03-121-0/+18
| |
* | updated 'blob' kernel projectorWim van Aarle2015-03-121-51/+41
| |
* | parallel projectors now always use vector geometries internallyWim van Aarle2015-03-121-1/+21
| |
* | updated 'strip' kernel projectorWim van Aarle2015-03-111-50/+50
| |
* | updated 'linear' kernal projectorWim van Aarle2015-03-061-1/+1
| |
* | updated 'line' kernel projectorWim van Aarle2015-03-051-53/+55
| |
* | created parallel_vec geometry classWim van Aarle2015-03-032-0/+244
|/
* 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
| |
| * added get_geometry for 3d projection data objectsWim van Aarle2015-02-242-3/+3
| |
* | Remove CAsyncAlgorithm::timedJoinWillem Jan Palenstijn2015-02-251-26/+0
|/ | | | It is currently unused, and its current implementation is not very portable.
* Update copyright to -2015Willem Jan Palenstijn2015-01-2679-158/+158
|
* Update copyright headersWillem Jan Palenstijn2015-01-1979-395/+412
|
* Implement loading geometries into Projector3DWillem Jan Palenstijn2014-12-082-15/+41
|
* Remove unused filesWillem Jan Palenstijn2014-12-042-240/+0
|
* Move BP coordinate transformation to utility functionWillem Jan Palenstijn2014-12-032-6/+27
|
* Add ProjectionGeometry3D::projectPoint for par3d and cone.Willem Jan Palenstijn2014-12-025-0/+84
| | | | Par3d_vec and cone_vec to follow.
* Remove unused DetectorOffsetX/Y in ProjectionGeometry3DWillem Jan Palenstijn2014-12-012-124/+9
|
* Fix warningWillem Jan Palenstijn2014-10-061-1/+1
|
* Start supporting flexible 2D volume geometry in Cuda FBP tooWillem Jan Palenstijn2014-10-061-14/+47
|
* Support flexible 2D volume geometry in CudaReconstructionAlgorithm tooWillem Jan Palenstijn2014-10-011-50/+21
|
* Support flexible 2D volume geometryWillem Jan Palenstijn2014-10-011-34/+27
|
* Remove more obsolete debugging outputWillem Jan Palenstijn2014-09-242-21/+0
|
* Check for valid sinogram and volume masks in ReconstructionAlgorithmWillem Jan Palenstijn2014-06-262-1/+5
|
* Fix uninitialized varWillem Jan Palenstijn2014-05-022-0/+6
|