Changeset 29e2665 in sasview


Ignore:
Timestamp:
Mar 25, 2017 5:13:23 PM (2 years ago)
Author:
GitHub <noreply@…>
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:
e0125d6, d8161f2
Parents:
b485253 (diff), 1d310bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Andrew Jackson <andrew.jackson@…> (03/25/17 17:13:23)
git-committer:
GitHub <noreply@…> (03/25/17 17:13:23)
Message:

Merge pull request #51 from SasView?/ajj-4.1-acknowl

Updating local config with DOI etc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasview/local_config.py

    r73cbeec r1d310bb  
    3535'''Acknowledge its use in your publications as suggested below;''' 
    3636_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;''' 
    3939_acknowledgement_preamble_bullet3 =\ 
    4040'''Reference the model you used if appropriate (see documentation for refs);''' 
     
    4444'''This work benefited from the use of the SasView application, originally developed under NSF Award  
    4545DMR-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.''' 
     46under the SINE2020 project Grant No 654000.''' 
    4747 
    4848_acknowledgement =  \ 
    4949'''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).''' 
     50by 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  
     51EU Horizon 2020 programme under the SINE2020 project (Grant No 654000). 
     52 
     53A list of individual contributors can be found at: https://github.com/orgs/SasView/people 
     54''' 
    5255 
    5356_homepage = "http://www.sasview.org" 
Note: See TracChangeset for help on using the changeset viewer.