Changeset 9a0fc50 in 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. - Files:
-
- 12 added
- 5 deleted
- 40 edited
- 7 moved
-
.gitignore (modified) (view diffs)
-
LICENSE.TXT (modified) (view diffs)
-
docs/sasview/.gitignore (added)
-
docs/sasview/README.txt (added)
-
docs/sasview/Tutorial.pdf (modified) (view diffs)
-
docs/sasview/Tutorial.pptx (modified) (view diffs)
-
docs/sphinx-docs/build_sphinx.py (modified) (view diffs)
-
docs/sphinx-docs/source/conf.py (modified) (view diffs)
-
docs/sphinx-docs/source/rst_prolog (modified) (view diffs)
-
docs/sphinx-docs/source/user/tutorial.rst (modified) (view diffs)
-
installers/license.txt (modified) (view diffs)
-
installers/setup_exe.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/report_dialog.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/report_image_handler.py (added)
-
src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/basepage.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) (view diffs)
-
src/sas/sasview/__init__.py (modified) (view diffs)
-
src/sas/sasview/local_config.py (modified) (view diffs)
-
src/sas/sasview/media/.gitignore (added)
-
src/sas/sasview/media/README.txt (modified) (view diffs)
-
src/sas/sasview/media/Tutorial.pdf (modified) (view diffs)
-
src/sas/sasview/media/basic_1d_fitting_in_sasview_v3x_4x.pdf (added)
-
src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (added)
-
src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_RT2.xml (added)
-
src/sas/sasview/test/1d_data/Ludox_silica.xml (added)
-
src/sas/sasview/test/1d_data/cansas1d.xsl (added)
-
src/sas/sascalc/data_util/nxsunit.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/data_info.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/loader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) (view diffs)
-
src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/gui_manager.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (view diffs)
-
src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (deleted)
-
src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (deleted)
-
test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (deleted)
-
test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (deleted)
-
test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (deleted)
-
test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) (moved from test/sasdataloader/test/MAR07232_rest.h5) (view diffs)
-
test/sasdataloader/test/test_data/avg_testdata.txt (moved) (moved from test/sasdataloader/test/avg_testdata.txt) (view diffs)
-
test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasdata.h5 (added)
-
test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry.h5 (added)
-
test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry_multisasdata.h5 (added)
-
test/sasdataloader/test/test_data/ring_testdata.txt (moved) (moved from test/sasdataloader/test/ring_testdata.txt) (view diffs)
-
test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) (moved from test/sasdataloader/test/sectorphi_testdata.txt) (view diffs)
-
test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) (moved from test/sasdataloader/test/sectorq_testdata.txt) (view diffs)
-
test/sasdataloader/test/test_data/slabx_testdata.txt (moved) (moved from test/sasdataloader/test/slabx_testdata.txt) (view diffs)
-
test/sasdataloader/test/test_data/slaby_testdata.txt (moved) (moved from test/sasdataloader/test/slaby_testdata.txt) (view diffs)
-
test/sasdataloader/test/utest_abs_reader.py (modified) (view diffs)
-
test/sasdataloader/test/utest_averaging.py (modified) (view diffs)
-
test/sasdataloader/test/utest_cansas.py (modified) (view diffs)
-
test/sasdataloader/test/utest_red2d_reader.py (modified) (view diffs)
Note: See TracChangeset
for help on using the changeset viewer.
