Changeset 1d310bb in sasview
- Timestamp:
- Mar 25, 2017 5:12:04 PM (8 years ago)
- 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:
- b61bd57
- Parents:
- b485253
- git-author:
- Andrew Jackson <andrew.jackson@…> (03/25/17 17:12:04)
- git-committer:
- GitHub <noreply@…> (03/25/17 17:12:04)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/local_config.py
r73cbeec r1d310bb 35 35 '''Acknowledge its use in your publications as suggested below;''' 36 36 _acknowledgement_preamble_bullet2 =\ 37 '''Reference SasView as : M. Doucet, et al. SasView Version 4. 0, Zenodo''' +\38 ''', http://doi.org/10.5281/zenodo.159083;'''37 '''Reference SasView as : M. Doucet, et al. SasView Version 4.1, Zenodo''' +\ 38 ''', 10.5281/zenodo.438138;''' 39 39 _acknowledgement_preamble_bullet3 =\ 40 40 '''Reference the model you used if appropriate (see documentation for refs);''' … … 44 44 '''This work benefited from the use of the SasView application, originally developed under NSF Award 45 45 DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme 46 under the SINE2020 project Grant No 654000 , and by Patrick O'Brien & Adam Washington.'''46 under the SINE2020 project Grant No 654000.''' 47 47 48 48 _acknowledgement = \ 49 49 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained 50 by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft. SasView also contains code developed with funding from the 51 EU Horizon 2020 programme under the SINE2020 project (Grant No 654000), and by Patrick O'Brien (pycrust) and Adam Washington (corfunc-py).''' 50 by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft and the scattering community. SasView also contains code developed with funding from the 51 EU Horizon 2020 programme under the SINE2020 project (Grant No 654000). 52 53 A list of individual contributors can be found at: https://github.com/orgs/SasView/people 54 ''' 52 55 53 56 _homepage = "http://www.sasview.org"
Note: See TracChangeset
for help on using the changeset viewer.