csa/tomo/approximate/astra.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into parallel_vec	Wim van Aarle	2015-05-26	23	-278/+1144
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
\| *	Merge pull request #65 from dmpelt/cython-char-fix	Willem Jan Palenstijn	2015-05-26	1	-7/+14
\| \|\ \| \| \| \| \| \|	Hold reference to results of six.b calls
\| \| *	Hold reference to results of six.b calls	Daan Pelt	2015-05-18	1	-7/+14
\| \| \|
\| * \|	Fix range import for old six versions	Daniel M. Pelt	2015-05-18	3	-3/+18
\| \| \|
\| * \|	Merge pull request #61 from wjp/xmlnode_cleanup	Willem Jan Palenstijn	2015-05-08	3	-50/+26
\| \|\ \ \| \| \| \| \| \| \| \|	Clean up XMLNode
\| \| * \|	Make XML array handling consistent	Willem Jan Palenstijn	2015-05-06	2	-26/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	setContent and getContent were using different XML formats previously.
\| \| * \|	Change XMLNode* to XMLNode	Willem Jan Palenstijn	2015-05-06	3	-24/+15
\| \| \|/ \| \| \| \| \| \| \| \| \|	An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
\| * \|	Merge pull request #46 from dmpelt/spot-like-python	Willem Jan Palenstijn	2015-05-08	3	-136/+198
\| \|\ \ \| \| \| \| \| \| \| \|	Add SPOT-like object for Python (overrides `__mul__` and works with scipy.sparse.linalg)
\| \| * \|	Rename optomo.py for Python 2 support	Daniel M. Pelt	2015-05-08	2	-1/+1
\| \| \| \|
\| \| * \|	Use superclass __mul__ in Python OpTomo __mul__	Daniel M. Pelt	2015-05-07	1	-22/+11
\| \| \| \|
\| \| * \|	Add SPOT-like object for Python (overrides `__mul__` and works with ↵	Daan Pelt	2015-05-04	3	-136/+209
\| \| \|/ \| \| \| \| \| \| \| \| \|	scipy.sparse.linalg)
\| * \|	Do not allow 1D input in Python link method	Daniel M. Pelt	2015-05-07	2	-16/+4
\| \| \|
\| * \|	Check data size when using 'link' function in Python	Daan Pelt	2015-04-30	4	-23/+98
\| \|/
\| *	Merge pull request #52 from wjp/change_geometry3d	Willem Jan Palenstijn	2015-04-14	3	-0/+81
\| \|\ \| \| \| \| \| \|	Add data3d('change_geometry')
\| \| *	Add python data3d.change_geometry	Willem Jan Palenstijn	2015-04-10	3	-0/+81
\| \| \|
\| * \|	Add 'link' feature to Python (for 2D and 3D data)	Daniel M. Pelt	2015-04-09	6	-9/+107
\| \|/
\| *	Merge branch 'master' into logging	Willem Jan Palenstijn	2015-03-20	10	-61/+375
\| \|\
\| \| *	Adjust docstring and samples to new python create_sino function	Willem Jan Palenstijn	2015-03-06	1	-4/+0
\| \| \|
\| \| *	Added Python support for CUDA projectors	Daniel M. Pelt	2015-03-05	10	-57/+375
\| \| \|
\| * \|	Add logging support to Python	Daniel M. Pelt	2015-03-10	3	-0/+250
\| \|/
\| *	Make Python get_geometry code match Matlab (after ↵	Daniel M. Pelt	2015-03-03	8	-187/+181
\| \| \| \| \| \| \| \|	03a9dd972ada50eedb83386910cecf02fe8d0e35)
* \|	updated python bindings	Wim van Aarle	2015-03-18	8	-189/+181
\| \|
* \|	updated python tools	Wim van Aarle	2015-03-17	1	-1/+35
\| \|
* \|	added parallel_vec to the python bindings	Wim van Aarle	2015-03-12	5	-1/+44
\|/
*	Added Python interface	Daniel M. Pelt	2015-02-24	29	-0/+3409