diff options
| author | Thomas White <taw@physics.org> | 2017-07-06 17:22:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-07-06 17:24:59 +0200 |
| commit | 5292f57d4434c7267e8d945871513d742ff42427 (patch) | |
| tree | d460aa5cef5a501516876850ef243cfc27313d5a /README | |
| parent | 48d4a6b8e82cce81222ec58fdfb488ed79ce0bcf (diff) | |
| parent | dc3395900fc3ce0d3961757628ff83ad6456be19 (diff) | |
Merge branch 'master' into taketwo
Diffstat (limited to 'README')
| -rw-r--r-- | README | 26 |
1 files changed, 20 insertions, 6 deletions
@@ -1,7 +1,7 @@ CrystFEL - Crystallography with a FEL ------------------------------------- -Copyright © 2012-2016 Deutsches Elektronen-Synchrotron DESY, +Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association. Authors: @@ -26,6 +26,9 @@ Authors: Keitaro Yamashita <k.yamashita@spring8.or.jp> Marmoru Suzuki <mamoru.suzuki@protein.osaka-u.ac.jp> Thomas Grant <tgrant@hwi.buffalo.edu> + Steve Aplin <steve.aplin@desy.de> + Oleksandr Yefanov <oleksandr.yefanov@desy.de> + Helen Ginn <helen@strubi.ox.ac.uk> CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -150,11 +153,6 @@ then your version of FFTW3 is not compiled in a suitable way. You'll need to install it again (from source) adding "--enable-shared" to its ./configure command line. -If you get an error about "cairo_surface_show_page" in src/scaling-report.c, -simply edit the file and comment that line out. Partialator will then not be -able to produce a useful scaling report, but the rest of CrystFEL will work -properly. - If you are installing from Git, the following extra things apply: - You must run "./autogen.sh" to generate "configure" and other files before @@ -174,3 +172,19 @@ If you are installing from Git, the following extra things apply: - You will not be able to use the "--enable-gtk-doc" option to configure unless you have at least version 1.9 of gtk-doc installed. + +Funding acknowledgements +------------------------ + +Development of CrystFEL is primarily funded by the Helmholtz Association via +programme-oriented funds. + +Additional funding for CrystFEL is provided by "X-Probe", a project of the +European Union's 2020 Research and Innovation Program Under the Marie +Skłodowska-Curie grant agreement 637295 (2015-2018). + +Additional funding for CrystFEL is provided by the BMBF German-Russian +Cooperation "SyncFELMed", grant 05K14CHA (2014-2017). + +Past funding for CrystFEL has been received from BioStruct-X, a project funded +by the Seventh Framework Programme (FP7) of the European Commission. |