diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-18 17:48:37 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-18 17:48:37 +0100 |
| commit | 29b0cdc83a048ed0bb25f52fd97e020a71e533c6 (patch) | |
| tree | 57feed06e62fbe9758f1a46fb6c4b1b35442de7c /python/astra/astra_c.pyx | |
| parent | a7ce7a296545a9361c496e906997c9b7b5d70875 (diff) | |
| parent | 5773a3d779083bb3dba85106fbe9dc45aeb346ea (diff) | |
| download | astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.tar.gz astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.tar.bz2 astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.tar.xz astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.zip | |
Merge branch 'master'
Diffstat (limited to 'python/astra/astra_c.pyx')
| -rw-r--r-- | python/astra/astra_c.pyx | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx index 342a214..6b246b6 100644 --- a/python/astra/astra_c.pyx +++ b/python/astra/astra_c.pyx @@ -45,21 +45,19 @@ ELSE: pass def credits(): - six.print_(""" -All Scale Tomographic Reconstruction Antwerp Toolbox (ASTRA-Toolbox) -was developed at the University of Antwerp by - * Prof. dr. Joost Batenburg - * Andrei Dabravolski - * Gert Merckx - * Willem Jan Palenstijn - * Tom Roelandts - * Prof. dr. Jan Sijbers - * dr. Wim van Aarle - * Sander van der Maar - * dr. Gert Van Gompel - -Python interface written by - * Daniel M. Pelt (CWI, Amsterdam)""") + six.print_("""The ASTRA Toolbox has been developed at the University of Antwerp and CWI, Amsterdam by + * Prof. dr. Joost Batenburg + * Prof. dr. Jan Sijbers + * Dr. Jeroen Bedorf + * Dr. Folkert Bleichrodt + * Dr. Andrei Dabravolski + * Dr. Willem Jan Palenstijn + * Dr. Tom Roelandts + * Dr. Wim van Aarle + * Dr. Gert Van Gompel + * Sander van der Maar, MSc. + * Gert Merckx, MSc. + * Daan Pelt, MSc.""") def use_cuda(): |