Changeset 9a0fc50 in sasview for src/sas/sasview
- Timestamp:
- Sep 13, 2018 2:31:36 PM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
- Children:
- 43313e72
- Parents:
- feec1cb (diff), 356af60e (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. - Location:
- src/sas/sasview
- Files:
-
- 6 added
- 2 deleted
- 4 edited
-
__init__.py (modified) (1 diff)
-
local_config.py (modified) (1 diff)
-
media/.gitignore (added)
-
media/README.txt (modified) (1 diff)
-
media/Tutorial.pdf (modified) (previous)
-
media/basic_1d_fitting_in_sasview_v3x_4x.pdf (added)
-
media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (added)
-
test/1d_data/ISIS_Polymer_Blend_RT2.xml (added)
-
test/1d_data/Ludox_silica.xml (added)
-
test/1d_data/cansas1d.xsl (added)
-
test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (deleted)
-
test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (deleted)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasview/__init__.py
ra8bbba2 rb229a3b 1 __version__ = "4.2.0 -beta"1 __version__ = "4.2.0" 2 2 __build__ = "GIT_COMMIT" -
src/sas/sasview/local_config.py
rb963b20 rb229a3b 48 48 '''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.''' 49 49 _acknowledgement_citation = \ 50 '''M. Doucet et al. SasView Version 4. 1.2, Zenodo, 10.5281/zenodo.825675'''50 '''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041''' 51 51 52 52 _acknowledgement = \ -
src/sas/sasview/media/README.txt
r914ba0a r356af60e 1 The files in this folder are what get shipped in the installer \media folder. 2 3 The help documentation gets shipped in the /doc folder. 4 1 5 This Tutorial.pdf is what appears when you click on 'Tutorial' under 'Help' 2 in the menu bar.6 in the SasView menu bar. It has been manually copied over from sasview/docs/sasview. 3 7 4 The source files are in: /sasview/docs/sasview 5 6 The getting_started_with_sasview.pdf has been manually added here until the auto-generated LibreOffice doc build is up and running. 8 The new tutorial pdfs here have been manually copied over from the website /downloads folder.
Note: See TracChangeset
for help on using the changeset viewer.
