Changeset 0a924c6 in sasview
- Timestamp:
- Mar 5, 2019 12:33:47 PM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249
- Children:
- 8c9e65c
- Parents:
- f58a13a (diff), 75313af (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:
- Paul Butler <butlerpd@…> (03/05/19 12:33:47)
- git-committer:
- GitHub <noreply@…> (03/05/19 12:33:47)
- Files:
-
- 10 added
- 5 deleted
- 38 edited
- 8 moved
-
src/sas/sasgui/plottools/PlotPanel.py (modified) (view diffs)
-
.gitignore (modified) (view diffs)
-
LICENSE.TXT (modified) (view diffs)
-
conftest.py (added)
-
docs/sasview/Tutorial.pdf (modified) (view diffs)
-
docs/sasview/Tutorial.pptx (modified) (view diffs)
-
docs/sasview/Tutorial_SV4.pdf (added)
-
docs/sasview/Tutorial_SV4.pptx (added)
-
docs/sphinx-docs/source/conf.py (modified) (view diffs)
-
docs/sphinx-docs/source/user/RELEASE.rst (modified) (view diffs)
-
installers/license.txt (modified) (view diffs)
-
setup.py (modified) (view diffs)
-
src/sas/_config.py (modified) (view diffs)
-
src/sas/sascalc/corfunc/transform_thread.py (modified) (view diffs)
-
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/associations.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/sasgui/perspectives/calculator/model_editor.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (view diffs)
-
src/sas/sasview/__init__.py (modified) (view diffs)
-
src/sas/sasview/local_config.py (modified) (view diffs)
-
src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (deleted)
-
src/sas/sasview/test/1d_data/FK403_0006_Nika.hdf (added)
-
src/sas/sasview/test/1d_data/Lew_Sa3_DSM_QinA.h5 (added)
-
src/sas/sasview/test/1d_data/VTMA.h5 (added)
-
src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (deleted)
-
src/sas/sasview/test/2d_data/BAM_2D.h5 (added)
-
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/sam14_cor.txt (moved) (moved from test/sasdataloader/test/sam14_cor.cor) (view diffs)
-
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_ascii.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_generic_file_reader_class.py (modified) (view diffs)
-
test/sasdataloader/test/utest_red2d_reader.py (modified) (view diffs)
-
test/sasdataloader/test/utest_sesans.py (modified) (view diffs)
Note: See TracChangeset
for help on using the changeset viewer.
