Changeset d3114cc in sasview

Timestamp:

Sep 12, 2018 8:53:56 AM (6 years ago)

Author:

smk78

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

7495a56

Parents:

0347c89

Message:

Updated installer license text

File:

• installers/license.txt (modified) (1 diff)

installers/license.txt

@@ -1 +1 @@
 This software was originally developed by the University of Tennessee 
 as part of the Distributed Data Analysis of Neutron Scattering 
-Experiments (DANSE) project funded by the US National Science Foundation
-and is currently being developed as an open source project hosted on GitHub
-and managed by a consortium of scattering facilities.
+Experiments (DANSE) project funded by the US National Science 
+Foundation (NSF), but is currently being developed as an Open Source 
+project hosted on GitHub and managed by a consortium of scattering 
+facilities.
 
-Participating facilities include: the University of Tennessee, the University 
-of Maryland, the European Spallation Source, the National Institute of 
-Standards & Technology Center for Neutron Research, the Oak Ridge National 
-Laboratory Neutron Sciences Directorate, the ISIS Neutron & Muon Source, the 
-Institut Laue Langevin, the Diamond Light Source, and Delft University of 
-Technology.
+Participating facilities include (in alphabetical order): 
+the Australian National Science & Technology Centre for Neutron 
+Scattering, the Diamond Light Source, the European Spallation Source, 
+the Institut Laue Langevin, the ISIS Pulsed Neutron & Muon Source, 
+the National Institute of Standards & Technology Center for Neutron 
+Research, the Oak Ridge National Laboratory Neutron Sciences 
+Directorate, and the Technical University Delft Reactor Institute.
 
-If you use this application to do scientific research that leads to publication, 
-we kindly ask that you acknowledge the use of the software with the following 
-sentence:
+SasView is distributed under a 'Three-clause' BSD licence which you 
+may read here: https://github.com/SasView/sasview/blob/master/LICENSE.TXT 
 
-*"This work benefited from the use of the SasView application, originally 
-developed under NSF award DMR-0520547."*
+SasView is free to download and use, including for commercial purposes.
 
-(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT
+© 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS 
+
+
+If you use SasView to do productive scientific research that leads to 
+a publication, we ask that you acknowledge use of the program with 
+the following text:
+
+"This work benefited from the use of the SasView application, originally 
+developed under NSF Award DMR-0520547. SasView also contains code 
+developed with funding from the EU Horizon 2020 programme under the 
+SINE2020 project Grant No 654000."