Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into parallel_vec | Wim van Aarle | 2015-05-26 | 48 | -656/+758 |
|\ | | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp | ||||
| * | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -63/+87 |
| | | | | | | | | setContent and getContent were using different XML formats previously. | ||||
| * | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 42 | -506/+410 |
| | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | ||||
| * | Fix memory leak in the config | Jeroen Bédorf | 2015-04-30 | 1 | -0/+5 |
| | | |||||
| * | Now include path is system-independent. | Valerii Sokolov | 2015-04-29 | 2 | -10/+0 |
| | | |||||
| * | Merge pull request #52 from wjp/change_geometry3d | Willem Jan Palenstijn | 2015-04-14 | 2 | -0/+18 |
| |\ | | | | | | | Add data3d('change_geometry') | ||||
| | * | Add changeGeometry function to Data3D classes | Willem Jan Palenstijn | 2015-04-10 | 2 | -0/+18 |
| | | | |||||
| * | | Add 'link' feature to Python (for 2D and 3D data) | Daniel M. Pelt | 2015-04-09 | 2 | -0/+39 |
| |/ | |||||
| * | Fix typo in error message | Willem Jan Palenstijn | 2015-03-30 | 1 | -1/+1 |
| | | |||||
| * | Add missing error on wrong projgeom type in CProjector3D::initialize | Willem Jan Palenstijn | 2015-03-30 | 1 | -0/+1 |
| | | |||||
| * | Only allow stdout and stderr for screen logging | Daniel M. Pelt | 2015-03-13 | 1 | -1/+5 |
| | | |||||
| * | Use a less verbose default fmt for screen logging and cleaner messages | Daniel M. Pelt | 2015-03-13 | 4 | -3/+4 |
| | | |||||
| * | Enable logging to Matlab window using callback function | Daniel M. Pelt | 2015-03-13 | 1 | -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. Pelt | 2015-03-13 | 7 | -7/+7 |
| | | | | | | | | these defines | ||||
| * | Use new logging API internally instead of printf / iostream | Daniel M. Pelt | 2015-03-10 | 7 | -7/+24 |
| | | |||||
| * | Adds new logging capabilities (based on clog.h) | Daniel M. Pelt | 2015-03-10 | 1 | -0/+175 |
| | | |||||
| * | Remove old Logging code (only used in fft.cu) | Daniel M. Pelt | 2015-03-09 | 2 | -85/+6 |
| | | |||||
| * | Fix getConfiguration type for vec geometries | Willem Jan Palenstijn | 2015-03-03 | 2 | -2/+2 |
| | | |||||
| * | Fix getConfiguration for vec geometries and non-square detectors | Willem Jan Palenstijn | 2015-03-03 | 2 | -6/+6 |
| | | |||||
* | | corrected geometry names | Wim van Aarle | 2015-03-18 | 2 | -8/+8 |
| | | |||||
* | | removed extraDetectorOffset | Wim van Aarle | 2015-03-13 | 2 | -20/+1 |
| | | |||||
* | | updated 'line_fanflat' projector | Wim van Aarle | 2015-03-12 | 1 | -0/+18 |
| | | |||||
* | | updated 'blob' kernel projector | Wim van Aarle | 2015-03-12 | 1 | -51/+41 |
| | | |||||
* | | parallel projectors now always use vector geometries internally | Wim van Aarle | 2015-03-12 | 1 | -1/+21 |
| | | |||||
* | | updated 'strip' kernel projector | Wim van Aarle | 2015-03-11 | 1 | -50/+50 |
| | | |||||
* | | updated 'linear' kernal projector | Wim van Aarle | 2015-03-06 | 1 | -1/+1 |
| | | |||||
* | | updated 'line' kernel projector | Wim van Aarle | 2015-03-05 | 1 | -53/+55 |
| | | |||||
* | | created parallel_vec geometry class | Wim van Aarle | 2015-03-03 | 2 | -0/+244 |
|/ | |||||
* | Untangle cuda and astra includes | Willem Jan Palenstijn | 2015-03-02 | 1 | -0/+75 |
| | |||||
* | Merge pull request #20 from wvaarle/matlab-get-geometry | Willem Jan Palenstijn | 2015-02-27 | 13 | -38/+219 |
|\ | | | | | 'get_geometry' functions in the matlab layer | ||||
| * | updated docs | Wim van Aarle | 2015-02-26 | 4 | -43/+0 |
| | | |||||
| * | get_geometry now uses XML config object (for projections) | Wim van Aarle | 2015-02-26 | 9 | -7/+170 |
| | | |||||
| * | get_geometry now uses XML config object (for volumes) | Wim van Aarle | 2015-02-25 | 4 | -1/+62 |
| | | |||||
| * | re-enabled get_geometry for 3d projectors | Wim van Aarle | 2015-02-24 | 2 | -2/+2 |
| | | |||||
| * | added get_geometry for 3d projection data objects | Wim van Aarle | 2015-02-24 | 2 | -3/+3 |
| | | |||||
* | | Remove CAsyncAlgorithm::timedJoin | Willem Jan Palenstijn | 2015-02-25 | 1 | -26/+0 |
|/ | | | | It is currently unused, and its current implementation is not very portable. | ||||
* | Update copyright to -2015 | Willem Jan Palenstijn | 2015-01-26 | 79 | -158/+158 |
| | |||||
* | Update copyright headers | Willem Jan Palenstijn | 2015-01-19 | 79 | -395/+412 |
| | |||||
* | Implement loading geometries into Projector3D | Willem Jan Palenstijn | 2014-12-08 | 2 | -15/+41 |
| | |||||
* | Remove unused files | Willem Jan Palenstijn | 2014-12-04 | 2 | -240/+0 |
| | |||||
* | Move BP coordinate transformation to utility function | Willem Jan Palenstijn | 2014-12-03 | 2 | -6/+27 |
| | |||||
* | Add ProjectionGeometry3D::projectPoint for par3d and cone. | Willem Jan Palenstijn | 2014-12-02 | 5 | -0/+84 |
| | | | | Par3d_vec and cone_vec to follow. | ||||
* | Remove unused DetectorOffsetX/Y in ProjectionGeometry3D | Willem Jan Palenstijn | 2014-12-01 | 2 | -124/+9 |
| | |||||
* | Fix warning | Willem Jan Palenstijn | 2014-10-06 | 1 | -1/+1 |
| | |||||
* | Start supporting flexible 2D volume geometry in Cuda FBP too | Willem Jan Palenstijn | 2014-10-06 | 1 | -14/+47 |
| | |||||
* | Support flexible 2D volume geometry in CudaReconstructionAlgorithm too | Willem Jan Palenstijn | 2014-10-01 | 1 | -50/+21 |
| | |||||
* | Support flexible 2D volume geometry | Willem Jan Palenstijn | 2014-10-01 | 1 | -34/+27 |
| | |||||
* | Remove more obsolete debugging output | Willem Jan Palenstijn | 2014-09-24 | 2 | -21/+0 |
| | |||||
* | Check for valid sinogram and volume masks in ReconstructionAlgorithm | Willem Jan Palenstijn | 2014-06-26 | 2 | -1/+5 |
| | |||||
* | Fix uninitialized var | Willem Jan Palenstijn | 2014-05-02 | 2 | -0/+6 |
| |