Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasview/local_config.py

    r1779e72 r463e7ffc  
    77import sas.sasview 
    88import logging 
     9 
     10logger = logging.getLogger(__name__) 
    911 
    1012# Version of the application 
     
    4648 
    4749_acknowledgement =  \ 
    48 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: https://github.com/orgs/SasView/people 
     50'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: https://github.com/orgs/SasView/people 
    4951''' 
    5052 
     
    5759 
    5860icon_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "images")) 
    59 logging.info("icon path: %s" % icon_path) 
     61logger.info("icon path: %s" % icon_path) 
    6062media_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "media")) 
    6163test_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "test")) 
     
    7072_ansto_logo = os.path.join(icon_path, "ansto_logo.png") 
    7173_tudelft_logo = os.path.join(icon_path, "tudelft_logo.png") 
    72 _dls_logo = os.path.join(icon_path, "dls_logo.png") 
    7374_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    7475_danse_logo = os.path.join(icon_path, "danse_logo.png") 
     
    8485_ansto_url = "http://www.ansto.gov.au/" 
    8586_tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/" 
    86 _dls_url = "http://www.diamond.ac.uk/" 
    8787_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    8888_inst_url = "http://www.utk.edu" 
    8989_corner_image = os.path.join(icon_path, "angles_flat.png") 
    9090_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    91 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft and DLS" 
     91_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 
    9292marketplace_url = "http://marketplace.sasview.org/" 
    9393 
Note: See TracChangeset for help on using the changeset viewer.