Changeset 9687d58 in sasview for sasview/local_config.py


Ignore:
Timestamp:
Apr 10, 2017 2:01:46 AM (7 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
6c8fb2c
Parents:
9208346 (diff), c6f3aec (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.
Message:

Merge branch 'master' into ESS_GUI

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasview/local_config.py

    r31c5b58 r9687d58  
    3131_acknowledgement_preamble =\ 
    3232'''To ensure the long term support and development of this software please''' +\ 
    33 ''' remember to do the following.''' 
     33''' remember to:''' 
    3434_acknowledgement_preamble_bullet1 =\ 
    35 '''Acknowledge its use in your publications as suggested below''' 
     35'''Acknowledge its use in your publications as suggested below;''' 
    3636_acknowledgement_preamble_bullet2 =\ 
    37 '''Reference the following website: http://www.sasview.org''' 
     37'''Reference SasView as : M. Doucet, et al. SasView Version 4.0, Zenodo''' +\ 
     38''', http://doi.org/10.5281/zenodo.159083;''' 
    3839_acknowledgement_preamble_bullet3 =\ 
    39 '''Reference the model you used if appropriate (see documentation for refs)''' 
     40'''Reference the model you used if appropriate (see documentation for refs);''' 
    4041_acknowledgement_preamble_bullet4 =\ 
    4142'''Send us your reference for our records: developers@sasview.org''' 
    4243_acknowledgement_publications = \ 
    43 '''This work benefited from the use of the SasView application, originally 
    44 developed under NSF award DMR-0520547. 
    45 ''' 
     44'''This work benefited from the use of the SasView application, originally developed under NSF Award  
     45DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme  
     46under the SINE2020 project Grant No 654000, and by Patrick O'Brien & Adam Washington.''' 
     47 
    4648_acknowledgement =  \ 
    47 '''This work originally developed as part of the DANSE project funded by the NSF 
    48 under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
    49 and ILL. 
     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  
     50by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft. SasView also contains code developed with funding from the  
     51EU Horizon 2020 programme under the SINE2020 project (Grant No 654000), and by Patrick O'Brien (pycrust) and Adam Washington (corfunc-py).''' 
    5052 
    51 ''' 
    5253_homepage = "http://www.sasview.org" 
    5354_download = __download_page__ 
    … …  
    6566_umd_logo = os.path.join(icon_path, "umd_logo.png") 
    6667_sns_logo = os.path.join(icon_path, "sns_logo.png") 
     68_ornl_logo = os.path.join(icon_path, "ornl_logo.png") 
    6769_isis_logo = os.path.join(icon_path, "isis_logo.png") 
    6870_ess_logo = os.path.join(icon_path, "ess_logo.png") 
    6971_ill_logo = os.path.join(icon_path, "ill_logo.png") 
     72_ansto_logo = os.path.join(icon_path, "ansto_logo.png") 
     73_tudelft_logo = os.path.join(icon_path, "tudelft_logo.png") 
    7074_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    7175_danse_logo = os.path.join(icon_path, "danse_logo.png") 
    … …  
    7478_umd_url = "http://www.umd.edu/" 
    7579_sns_url = "http://neutrons.ornl.gov/" 
     80_ornl_url = "http://neutrons.ornl.gov/" 
    7681_nsf_url = "http://www.nsf.gov" 
    7782_isis_url = "http://www.isis.stfc.ac.uk/" 
    7883_ess_url = "http://ess-scandinavia.eu/" 
    7984_ill_url = "http://www.ill.eu/" 
     85_ansto_url = "http://www.ansto.gov.au/" 
     86_tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/" 
    8087_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    8188_inst_url = "http://www.utk.edu" 
    8289_corner_image = os.path.join(icon_path, "angles_flat.png") 
    8390_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    84 _copyright = "(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and ILL" 
    85  
     91_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 
     92marketplace_url = "http://marketplace.sasview.org/" 
    8693 
    8794#edit the list of file state your plugin can read 
    … …  
    9097GUIFRAME_WIDTH = 1150 
    9198GUIFRAME_HEIGHT = 840 
    92 PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv'] 
     99PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv', '.crf'] 
    93100PLUGINS_WLIST = ['Fitting files (*.fitv)|*.fitv', 
    94101                 'Invariant files (*.inv)|*.inv', 
    95                  'P(r) files (*.prv)|*.prv'] 
     102                 'P(r) files (*.prv)|*.prv', 
     103                 'Corfunc files (*.crf)|*.crf'] 
    96104PLOPANEL_WIDTH = 415 
    97105PLOPANEL_HEIGTH = 370 
    … …  
    132140UPDATE_TIMEOUT = 2 
    133141 
     142#OpenCL option 
     143SAS_OPENCL = None 
     144 
    134145def printEVT(message): 
    135146    if __EVT_DEBUG__: 
Note: See TracChangeset for help on using the changeset viewer.