Changeset e0f28e6 in sasview for sasview/local_config.py

Timestamp:

Oct 4, 2016 1:13:42 PM (8 years ago)

Author:

smk78

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c1fdf84

Parents:

d4c8513a

Message:

Updated About box text and images. Changed SNS image to ORNL image (more
inclusive) and added ANSTO image.

File:

• sasview/local_config.py (modified) (4 diffs)

sasview/local_config.py

@@ -35 +35 @@
 '''Acknowledge its use in your publications as suggested below'''
 _acknowledgement_preamble_bullet2 =\
-'''Reference SasView as : Doucet M, et. al. SasView version 4.0, Zenodo''' +\
+'''Reference SasView as : M. Doucet, et al. SasView Version 4.0, Zenodo''' +\
 ''', http://doi.org/10.5281/zenodo.159083'''
 _acknowledgement_preamble_bullet3 =\
@@ -43 +43 @@
 _acknowledgement_publications = \
 '''This work benefited from the use of the SasView application, originally
-developed under NSF award DMR-0520547. SasView contains code developed with
-funding from the European Union's Horizon 2020 research and innovation programme
-under the SINE2020 project, grant agreement No 654000.
-'''
+developed under NSF Award DMR-0520547. SasView also contains code developed 
+with funding from the EU Horizon 2020 research and innovation programme under 
+the SINE2020 project Grant No 654000.'''
+
 _acknowledgement =  \
-'''This work originally developed as part of the DANSE project funded by the NSF
-under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS
-and ILL. SasView contains code developed with funding from the European Union's
-Horizon 2020 research and innovation programme under the SINE2020 project, grant
-agreement No 654000.
+'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained by a 
+collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO. SasView also contains code developed with funding from the EU Horizon 2020 
+research and innovation programme under the SINE2020 project (Grant No 654000).'''
 
-'''
 _homepage = "http://www.sasview.org"
 _download = __download_page__
@@ -70 +67 @@
 _umd_logo = os.path.join(icon_path, "umd_logo.png")
 _sns_logo = os.path.join(icon_path, "sns_logo.png")
+_ornl_logo = os.path.join(icon_path, "ornl_logo.png")
 _isis_logo = os.path.join(icon_path, "isis_logo.png")
 _ess_logo = os.path.join(icon_path, "ess_logo.png")
 _ill_logo = os.path.join(icon_path, "ill_logo.png")
+_ansto_logo = os.path.join(icon_path, "ansto_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -79 +78 @@
 _umd_url = "http://www.umd.edu/"
 _sns_url = "http://neutrons.ornl.gov/"
+_ornl_url = "http://neutrons.ornl.gov/"
 _nsf_url = "http://www.nsf.gov"
 _isis_url = "http://www.isis.stfc.ac.uk/"
 _ess_url = "http://ess-scandinavia.eu/"
 _ill_url = "http://www.ill.eu/"
+_ansto_url = "http://www.ansto.gov.au/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS and ILL"
+_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO"