From 86ad56f005d9d3871f654390739459d5634dd5d5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 13 May 2015 11:52:28 +0200
Subject: Sync README.txt with README.md

---
 README.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'README.txt')

diff --git a/README.txt b/README.txt
index 2877594..eae5085 100644
--- a/README.txt
+++ b/README.txt
@@ -90,11 +90,14 @@ 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
+2011, http://dx.doi.org/10.1016/j.jsb.2011.07.017
 
-- 
cgit v1.2.3


From 2ff0de757c6e5ba87247f566aa68bc928672ae37 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 20 May 2015 09:06:13 +0200
Subject: Add note about autogen.sh

---
 README.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'README.txt')

diff --git a/README.txt b/README.txt
index eae5085..5ec6564 100644
--- a/README.txt
+++ b/README.txt
@@ -52,6 +52,7 @@ Linux, from source:
 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 <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 27 May 2015 11:54:04 +0200
Subject: Update README, NEWS

---
 README.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'README.txt')

diff --git a/README.txt b/README.txt
index 5ec6564..4be7ba0 100644
--- a/README.txt
+++ b/README.txt
@@ -49,18 +49,20 @@ 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
 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