From f5cc8fe93896dcd943db37e3fba1d49b7080cefe Mon Sep 17 00:00:00 2001 From: Wim van Aarle Date: Wed, 13 May 2015 11:38:16 +0200 Subject: Update README.md updated references --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index ec86136..6a647b4 100644 --- a/README.md +++ b/README.md @@ -64,10 +64,15 @@ Install by copying AstraCuda32.dll or AstraCuda64.dll from bin/ and ## References -If you use parallel beam GPU code for your research, we would appreciate it if you would refer to the following paper: +If you use the ASTRA Toolbox for your research, we would appreciate it if you would refer to the following paper: + +W. van Aarle, W. J. Palenstijn, J. De Beenhouwer, T. Altantzis, S. Bals, K J. Batenburg, and J. Sijbers, "The ASTRA Toolbox: A platform for advanced algorithm development in electron tomography", Ultramicroscopy (2015), http://dx.doi.org/10.1016/j.ultramic.2015.05.002 + +Additionally, if you use parallel beam GPU code, we would appreciate it if you would refer to the following paper: W. J. Palenstijn, K J. Batenburg, and J. Sijbers, "Performance improvements for iterative electron tomography reconstruction using graphics processing units (GPUs)", Journal of Structural Biology, vol. 176, issue 2, pp. 250-253, 2011. + ## License The ASTRA Toolbox is open source under the GPLv3 license. @@ -79,4 +84,4 @@ website: http://sf.net/projects/astra-toolbox Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp 2014-2015, CWI, Amsterdam - http://visielab.uantwerpen.be/ and http://www.cwi.nl/ \ No newline at end of file + http://visielab.uantwerpen.be/ and http://www.cwi.nl/ -- cgit v1.2.3 From 55318552b2f5d74b3ba03039d1ee60adae41703d Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 13 May 2015 11:50:52 +0200 Subject: Add DOI link for JSB paper as well --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 6a647b4..03c29dd 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ W. van Aarle, W. J. Palenstijn, J. De Beenhouwer, T. Altantzis, S. Bals, K J. B Additionally, if you use parallel beam GPU code, we would appreciate it if you would refer to the following paper: -W. J. Palenstijn, K J. Batenburg, and J. Sijbers, "Performance improvements for iterative electron tomography reconstruction using graphics processing units (GPUs)", Journal of Structural Biology, vol. 176, issue 2, pp. 250-253, 2011. +W. J. Palenstijn, K J. Batenburg, and J. Sijbers, "Performance improvements for iterative electron tomography reconstruction using graphics processing units (GPUs)", Journal of Structural Biology, vol. 176, issue 2, pp. 250-253, 2011, http://dx.doi.org/10.1016/j.jsb.2011.07.017 ## License -- cgit v1.2.3 From 2ff0de757c6e5ba87247f566aa68bc928672ae37 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 20 May 2015 09:06:13 +0200 Subject: Add note about autogen.sh --- README.md | 1 + 1 file changed, 1 insertion(+) (limited to 'README.md') diff --git a/README.md b/README.md index 03c29dd..0713209 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Requirements: g++, boost, CUDA (driver+toolkit), matlab ``` cd build/linux +./autogen.sh # when building a git version ./configure --with-cuda=/usr/local/cuda \ --with-matlab=/usr/local/MATLAB/R2012a \ --prefix=/usr/local/astra -- cgit v1.2.3 From 0bcde21948d619e9803de229ea40499b5e1dd873 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 27 May 2015 11:54:04 +0200 Subject: Update README, NEWS --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 0713209..6054006 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,14 @@ Add the mex and tools subdirectories to your matlab path. ### Linux, from source -Requirements: g++, boost, CUDA (driver+toolkit), matlab +Requirements: g++, boost, CUDA (driver+toolkit), Matlab and/or Python (2.7 or 3.x) ``` cd build/linux ./autogen.sh # when building a git version ./configure --with-cuda=/usr/local/cuda \ --with-matlab=/usr/local/MATLAB/R2012a \ + --with-python --prefix=/usr/local/astra make make install @@ -37,6 +38,7 @@ make install Add /usr/local/astra/lib to your LD_LIBRARY_PATH. Add /usr/local/astra/matlab and its subdirectories (tools, mex) to your matlab path. +Add /usr/local/astra/python to your PYTHONPATH. NB: Each matlab version only supports a specific range of g++ versions. -- cgit v1.2.3