# # ChangeLog for src/sas in sasview # # Generated by Trac 1.0.1 # Dec 23, 2024 2:31:40 AM Wed, 27 Mar 2019 18:53:38 GMT Paul Kienzle [7f5aa4f] * src/sas/sascalc/fit/fitstate.py (modified) tweak internal variable name Tue, 26 Mar 2019 19:43:55 GMT Paul Kienzle [1d56359] * src/sas/sascalc/fit/fitstate.py (modified) code cleanup: move shared code to function Tue, 26 Mar 2019 19:32:31 GMT Paul Kienzle [3f89c0e] * src/sas/sascalc/fit/fitstate.py (modified) raise error if file loaded by headless fit is ambiguous Tue, 26 Mar 2019 19:24:25 GMT Paul Kienzle [7ad12e9f] * src/sas/sascalc/fit/fitstate.py (modified) fix handling of user-defined data uncertainty in headless fits Tue, 26 Mar 2019 19:16:08 GMT Paul Kienzle [9cc1f49] * src/sas/sascalc/fit/fitstate.py (modified) doc tweak Tue, 26 Mar 2019 19:14:45 GMT Paul Kienzle [f0b9bce] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * .gitignore (modified) * conftest.py (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV4.pdf (added) * docs/sasview/Tutorial_SV4.pptx (added) * fit.py (added) * setup.py (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/ordereddicttest.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/fitstate.py (added) * src/sas/sascalc/fit/models.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/sascalculator/test/utest_sld.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) Merge branch 'ticket-1243' into ticket-1094-headless Tue, 12 Mar 2019 15:33:13 GMT Jeff Krzywon [2b3eb3d] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Use new combined method when loading in project files. refs #1243 Wed, 06 Mar 2019 23:18:51 GMT Paul Kienzle [cb44d66] * .gitignore (modified) * LICENSE.TXT (modified) * conftest.py (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV4.pdf (added) * docs/sasview/Tutorial_SV4.pptx (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * installers/license.txt (modified) * setup.py (modified) * src/sas/_config.py (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/ordereddicttest.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/models.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * 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/calculatorview/test/utest_gui_sld.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/sascalculator/test/utest_sld.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * 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) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * fit.py (added) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/fitstate.py (added) Merge branch 'master' into ticket-1094-headless Tue, 05 Mar 2019 21:26:14 GMT GitHub [7af652d] * .gitignore (modified) * LICENSE.TXT (modified) * conftest.py (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV4.pdf (added) * docs/sasview/Tutorial_SV4.pptx (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * installers/license.txt (modified) * run.py (modified) * setup.py (modified) * src/sas/_config.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (deleted) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (deleted) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * 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) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) Merge branch 'master' into py37-sascalc Tue, 05 Mar 2019 21:21:09 GMT Paul Kienzle [dbfd307] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/invertor.py (modified) use np >= 1.14.0 default for lstsq rcond, but compatible with np < ... Tue, 05 Mar 2019 18:52:24 GMT GitHub [8c9e65c] * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/ordereddicttest.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/models.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/sascalculator/test/utest_sld.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * .gitignore (modified) * LICENSE.TXT (modified) * conftest.py (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV4.pdf (added) * docs/sasview/Tutorial_SV4.pptx (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * installers/license.txt (modified) * run.py (modified) * setup.py (modified) * src/sas/_config.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (deleted) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (deleted) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * 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) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) py37 support for sascalc. Refs #888 an #1233. Tue, 05 Mar 2019 17:33:47 GMT GitHub [0a924c6] * src/sas/sasgui/plottools/PlotPanel.py (modified) * .gitignore (modified) * LICENSE.TXT (modified) * conftest.py (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV4.pdf (added) * docs/sasview/Tutorial_SV4.pptx (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * installers/license.txt (modified) * setup.py (modified) * src/sas/_config.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * 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) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Merge pull request #202 from SasView/ticket-1220 fix 2D log-scale ... Thu, 21 Feb 2019 22:23:13 GMT Paul Kienzle [4cbb2f5] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) pull conflicting changes from master Fri, 15 Feb 2019 11:36:40 GMT smk78 [4d06668] * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) Added note about Lorentz-correction to corfunc_help.rst Fixes #1225 Sun, 10 Feb 2019 18:13:57 GMT GitHub [5e16b30] * src/sas/sasview/__init__.py (modified) Update __init__.py Final update to __init__.py with the new DOI from ... Tue, 05 Feb 2019 23:47:30 GMT butler [db8805f] * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * src/sas/sasview/__init__.py (modified) Fix to PR comments Fix spelling in release notes and changed back to ... Sun, 03 Feb 2019 02:27:09 GMT butler [7556019] * docs/sphinx-docs/source/conf.py (modified) * src/sas/sasview/__init__.py (modified) Move all remaining version specific parameters to sasview.__init__ Edit ... Sat, 02 Feb 2019 21:49:27 GMT butler [839f70f7] * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) Move all version variables to init.py Move release date (for copyright) ... Sat, 02 Feb 2019 21:37:35 GMT butler [f38ff0b] * docs/sphinx-docs/source/conf.py (modified) * src/sas/sasview/__init__.py (modified) updated version number to 4.2.1 Updated verion number in init.py and in ... Sat, 02 Feb 2019 21:34:58 GMT butler [e572d4b] * src/sas/sasview/local_config.py (modified) Fix local_config Replaced hard coded version number with version number ... Wed, 23 Jan 2019 16:06:46 GMT GitHub [3d5e629] * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Merge pull request #204 from rprospero/Ticket_1223 Ticket 1223: Expand ... Tue, 22 Jan 2019 19:14:30 GMT awashington [ef74a8b] * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Increase maximum corfunc range to 1000 Sun, 20 Jan 2019 02:57:07 GMT butler [ca4f40d] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) replace checking for class name with isinstance throughout fitpage.py Thu, 17 Jan 2019 00:44:50 GMT butler [722c425] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) fix polar coordinate names Replace dqp and dqs with dq_r and dq_phi in ... Tue, 08 Jan 2019 21:48:15 GMT butler [f0c569d] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) clean up dispaly of smearing value 2D smearing data was already ... Tue, 08 Jan 2019 13:45:47 GMT butler [aa9928e] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Fix behavior of smear buttons Added check for self.model to ... Tue, 08 Jan 2019 13:00:45 GMT butler [f632247] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Fix 2D smearing GUI Make 2D from data as % of average. Fix input and ... Sun, 06 Jan 2019 00:15:46 GMT butler [bd3a3ae] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Fix reporting of pinhole resolution on FitPage when taken from data GUI ... Sat, 05 Jan 2019 02:07:37 GMT butler [73bc8563] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Show %dq/q instead of dq for pinhole read from data Display ... Sat, 05 Jan 2019 00:15:22 GMT butler [462e019] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Fix minor logic error in 2D smearing. Wed, 02 Jan 2019 20:57:45 GMT GitHub [dcd6efd] * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * 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) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * src/sas/_config.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) Merge pull request #180 from SasView/ticket-1111 Multiple data loader ... Fri, 21 Dec 2018 15:34:39 GMT Jeff Krzywon [d96744de] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * test/sasdataloader/test/sam14_cor.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) Fix for loading USANS data in ABS reader including fixes to unit tests. Mon, 17 Dec 2018 12:15:53 GMT GitHub [cb9640f] * src/sas/_config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) Merge pull request #196 from SasView/config-error redo handling of cust ... Wed, 12 Dec 2018 18:50:57 GMT Paul Kienzle [75313af] * src/sas/sasgui/plottools/PlotPanel.py (modified) fix 2D log-scale plotting; maybe broke vmin/vmax limits Wed, 12 Dec 2018 02:54:53 GMT GitHub [33d3a74] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) Merge pull request #200 from SasView/ticket-1218 Added newlines to ... Fri, 30 Nov 2018 17:35:08 GMT Jeff Krzywon [109afbd] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Prevent ValueErrors Thu, 29 Nov 2018 11:55:13 GMT GitHub [175b83f] * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Merge pull request #195 from SasView/ticket-1015-quick-fix Ticket 1015. ... Wed, 28 Nov 2018 17:01:20 GMT Jeff Krzywon [c7c8143] * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Load and save mask from NXcanSAS properly. Wed, 28 Nov 2018 15:41:14 GMT Paul Kienzle [93b34cc] * src/sas/_config.py (modified) add SAS_OPENCL default to the correct path Wed, 28 Nov 2018 09:17:36 GMT Piotr Rozyczko [1752f38] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Added newlines to import statements in the plugin model template. Tue, 20 Nov 2018 15:55:05 GMT Jeff Krzywon [9220e89c] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) Code cleanup and py3 compatibility fixes. Thu, 15 Nov 2018 19:09:18 GMT Jeff Krzywon [c222c27] * run.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (deleted) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (deleted) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * 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/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Merge branch 'master' into ticket-1111 Thu, 15 Nov 2018 17:17:42 GMT Jeff Krzywon [a165bee] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Don't throw out last data frame in multi frame data. Thu, 15 Nov 2018 17:08:56 GMT Jeff Krzywon [802fc18] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Support for multi-frame NXcanSAS data sets. Tue, 13 Nov 2018 20:58:59 GMT Paul Kienzle [a5cffe5] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) re-enable fitting using weights defined in the GUI. Refs #1205. Tue, 13 Nov 2018 19:52:30 GMT Paul Kienzle [1580cc3] * docs/sphinx-docs/source/user/RELEASE.rst (modified) * installers/license.txt (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (deleted) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (deleted) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasview/media/getting_started_with_sasview.pdf (modified) * fit.py (added) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/fitstate.py (added) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Merge branch 'master' into ticket-1094-headless Fri, 09 Nov 2018 20:48:41 GMT Jeff Krzywon [c1dc994] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Differentiate between array and scalar datasets when loading meta data. Fri, 09 Nov 2018 19:23:23 GMT Ricardo M. Ferraz Leal [fee520ec] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) ticket #1212 fixed the qx.data bug Fri, 02 Nov 2018 18:13:21 GMT Jeff Krzywon [9b08354] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Revert error handling change. Fri, 02 Nov 2018 17:04:28 GMT Paul Kienzle [47be5a1] * src/sas/_config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) redo handling of cust config failures Thu, 01 Nov 2018 20:35:01 GMT Jeff Krzywon [282bc3f] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) Change errors in NXcanSAS reader to a list to match the rest of the ... Thu, 01 Nov 2018 18:23:18 GMT Jeff Krzywon [dfcdbf8] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Handle INTs attributes properly, better handling of unrecognized units ... Wed, 31 Oct 2018 14:40:49 GMT Paul Kienzle [895703d] * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) clean out existing kernels when changing compute engine Tue, 30 Oct 2018 14:29:56 GMT GitHub [d742b56] * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (deleted) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (deleted) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) Merge pull request #191 from SasView/gpu-options-handling gpu options ... Thu, 25 Oct 2018 18:02:42 GMT Jeff Krzywon [9f45f83] * src/sas/sasgui/guiframe/gui_manager.py (modified) Fix backwards logic for dX values in data info window. Wed, 24 Oct 2018 15:10:35 GMT Paul Kienzle [e4e9162] * src/sas/sascalc/dataloader/manipulations.py (modified) update code comments Mon, 22 Oct 2018 22:10:45 GMT Paul Kienzle [57e48ca] * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) fix rcond requires float error in pr Mon, 22 Oct 2018 21:49:40 GMT Paul Kienzle [3e6829d] * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) default to floating point division in pr Thu, 18 Oct 2018 15:43:55 GMT krzywon [9fb4572] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) Reinstate shape check. Wed, 17 Oct 2018 20:30:31 GMT krzywon [845144e] * LICENSE.TXT (modified) * docs/sphinx-docs/source/index.rst (modified) * docs/sphinx-docs/source/user/RELEASE.rst (added) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/README-ABOUT-RELEASE-NOTES.txt (added) * installers/README-next-release.txt (deleted) * installers/README.txt (deleted) * installers/license.txt (modified) * src/sas/sascalc/corfunc/LICENSE.TXT (added) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasview/images/bam_logo.png (added) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added) * src/sas/sasview/media/getting_started_with_sasview.pdf (modified) * src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * 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/test_data/MAR07232_rest.h5 (moved) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Merge branch master into ticket-1111 Wed, 17 Oct 2018 20:20:16 GMT krzywon [b204004] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Remove unneeded shape check, give better error when saving fails, and ... Wed, 17 Oct 2018 13:07:51 GMT krzywon [b1ec23d] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) Remove unneeded shape check, give better error when saving fails, and ... Fri, 12 Oct 2018 01:49:59 GMT Paul Kienzle [7ba6470] * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) remove deprecation warnings for old buffer protocol from py37 build Thu, 11 Oct 2018 17:59:57 GMT Paul Kienzle [e090ba90] * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/ordereddicttest.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/models.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) remove errors and warnings from py37 tests of sascalc Thu, 11 Oct 2018 17:54:35 GMT Paul Kienzle [8e109f9] * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) use updated interface to sasmodels kernelcl Thu, 11 Oct 2018 17:33:22 GMT Paul Kienzle [952ea1f] * run.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (deleted) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (deleted) * src/sas/sascalc/pr/invertor.py (modified) move c extensions from core/module.so to _module.so Thu, 04 Oct 2018 11:46:22 GMT Piotr Rozyczko [5323490] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) remove e-06 from default magnetism values. Refs #1004 (#188) Thu, 04 Oct 2018 09:57:19 GMT smk78 [eb6f7f8] * src/sas/sasview/media/getting_started_with_sasview.pdf (modified) Added updated getting_started tutorial pdf Wed, 03 Oct 2018 18:42:00 GMT Paul Kienzle [1dc134e6] * LICENSE.TXT (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/license.txt (modified) * src/sas/sascalc/corfunc/LICENSE.TXT (added) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasview/images/bam_logo.png (added) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added) * src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified) * fit.py (added) * run.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/fitstate.py (added) Merge branch 'master' into ticket-1094-headless Wed, 03 Oct 2018 12:21:44 GMT GitHub [db24ec1] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * LICENSE.TXT (modified) * docs/sphinx-docs/source/user/RELEASE.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/license.txt (modified) * src/sas/sascalc/corfunc/LICENSE.TXT (added) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasview/images/bam_logo.png (added) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added) * src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified) Merge pull request #185 from SasView/ticket-1183-parameter-reset Ticket ... Tue, 02 Oct 2018 13:03:59 GMT Paul Kienzle [aba4559] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) fix comments Tue, 02 Oct 2018 01:02:08 GMT Paul Kienzle [ba1c145] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) post the parameters into the model before redraw on plugin update Sat, 29 Sep 2018 00:33:22 GMT butler [863ac2c] * src/sas/sascalc/fit/pagestate.py (modified) Update fix to pagestate.py for ticket-1179 branch as per P. Kienzle Use ... Fri, 28 Sep 2018 19:39:06 GMT krzywon [e9920cd] * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) Add SasView version to report files. refs #1179 Fri, 28 Sep 2018 18:31:33 GMT Paul Kienzle [ca30e36b] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) make sure the current page is shown after all pages are updated Fri, 28 Sep 2018 18:08:27 GMT smk78 [1b4cb41] * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasview/local_config.py (modified) Added BAM to About box Fri, 28 Sep 2018 17:34:58 GMT Paul Kienzle [93c505b] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) redo page update on plugin reload so recalc only happens if model ... Fri, 28 Sep 2018 17:24:02 GMT smk78 [94ce044] * src/sas/sasview/images/bam_logo.png (added) Add bam logo to sasview/src/sas/sasview/images Fri, 28 Sep 2018 11:20:48 GMT smk78 [490f790] * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) Tweaks to corfunc_help.rst Thu, 27 Sep 2018 16:37:09 GMT GitHub [acdf0d1] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * LICENSE.TXT (modified) * docs/sphinx-docs/source/index.rst (modified) * docs/sphinx-docs/source/user/RELEASE.rst (added) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/README-ABOUT-RELEASE-NOTES.txt (added) * installers/README-next-release.txt (deleted) * installers/README.txt (deleted) * src/sas/sascalc/corfunc/LICENSE.TXT (added) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added) * src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified) Merge pull request #183 from SasView/bad_file_loader_fix Continue ... Thu, 27 Sep 2018 10:42:39 GMT smk78 [dcca58d] * src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (modified) Updated tutorial Wed, 26 Sep 2018 21:07:03 GMT krzywon [9c7e2b8] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Keep file loader errors for each file together and separate files from ... Wed, 26 Sep 2018 17:26:22 GMT smk78 [a9261ca] * src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added) * src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified) Added new tutorial pdf and updated tutorial pdf Wed, 26 Sep 2018 17:02:33 GMT smk78 [357a65a] * src/sas/sascalc/corfunc/LICENSE.TXT (added) Added /sasview/src/sas/sascalc/corfunc/LICENSE.TXT from GitHub Wed, 26 Sep 2018 15:41:59 GMT Paul Kienzle [85cf6b8] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Don't clear parameters on structure box content reset Wed, 26 Sep 2018 13:49:58 GMT smk78 [5652efc] * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) Changed text displayed from Long Period / 2 to Long Period Mon, 24 Sep 2018 13:05:25 GMT krzywon [5218180] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Put error(s) in an array rather than scalar to prevent iterating through ... Mon, 24 Sep 2018 12:53:48 GMT krzywon [7ab3b79b] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Put error(s) in an array rather than scalar to prevent iterating through ... Fri, 21 Sep 2018 15:14:12 GMT smk78 [577460c] * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) Inserted LF to improve formatting in Sphinx Thu, 20 Sep 2018 16:44:12 GMT Paul Kienzle [840ac87] * .gitignore (modified) * LICENSE.TXT (modified) * docs/sasview/.gitignore (added) * docs/sasview/README.txt (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/index.rst (modified) * docs/sphinx-docs/source/rst_prolog (modified) * docs/sphinx-docs/source/user/RELEASE.rst (added) * docs/sphinx-docs/source/user/environment.rst (added) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * installers/README-ABOUT-RELEASE-NOTES.txt (added) * installers/README-next-release.txt (deleted) * installers/README.txt (deleted) * installers/license.txt (modified) * installers/setup_exe.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/report_image_handler.py (added) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/media/.gitignore (added) * src/sas/sasview/media/README.txt (modified) * src/sas/sasview/media/Tutorial.pdf (modified) * 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/sasview.py (modified) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_RT2.xml (added) * src/sas/sasview/test/1d_data/Ludox_silica.xml (added) * test/corfunc/test/utest_corfunc.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * fit.py (added) * run.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/fitstate.py (added) Merge branch 'master' into ticket-1094-headless Tue, 18 Sep 2018 17:27:13 GMT smk78 [8ac05a5] * docs/sphinx-docs/source/user/RELEASE.rst (added) * installers/README-ABOUT-RELEASE-NOTES.txt (added) * installers/RELEASE.txt (deleted) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/releasebox.py (deleted) * src/sas/sasview/local_config.py (modified) Implementing html Release Notes from Help menu. Tue, 18 Sep 2018 13:38:26 GMT krzywon [009abcc] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Continue loading remaining files if a single file cannot be loaded. Tue, 18 Sep 2018 13:36:59 GMT krzywon [926ece5] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) Py3 compatibility and code cleanup. Mon, 17 Sep 2018 16:33:08 GMT smk78 [5e88e27c] * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/releasebox.py (added) * src/sas/sasview/local_config.py (modified) Create Release Notes option in Help Menu and popup box Fri, 14 Sep 2018 14:26:06 GMT smk78 [5f08251] * src/sas/sasgui/guiframe/gui_manager.py (modified) Removed old commented text Fri, 14 Sep 2018 13:38:16 GMT krzywon [a78446ce] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Continue loading remaining files if a single file cannot be loaded. Fri, 14 Sep 2018 11:18:54 GMT smk78 [bb008fd] * src/sas/sasgui/guiframe/gui_manager.py (modified) Redirect Help >> Tutorial to Documentation tutorials page Thu, 13 Sep 2018 18:46:42 GMT krzywon [8a1f574] * src/sas/sasview/test/1d_data/cansas1d.xsl (deleted) Remove unneccessary xsl file from test 1D data folder. Thu, 13 Sep 2018 18:44:48 GMT krzywon [43313e72] * 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/1d_data/cansas1d.xsl (deleted) * src/sas/sasview/test/2d_data/BAM_2D.h5 (added) Add 1D and 2D test data files. Thu, 13 Sep 2018 18:31:36 GMT krzywon [9a0fc50] * .gitignore (modified) * LICENSE.TXT (modified) * docs/sasview/.gitignore (added) * docs/sasview/README.txt (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/rst_prolog (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/license.txt (modified) * installers/setup_exe.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/report_image_handler.py (added) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/media/.gitignore (added) * src/sas/sasview/media/README.txt (modified) * src/sas/sasview/media/Tutorial.pdf (modified) * 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) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * 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) * test/sasdataloader/test/test_data/avg_testdata.txt (moved) * 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) * test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) * test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) * test/sasdataloader/test/test_data/slabx_testdata.txt (moved) * test/sasdataloader/test/test_data/slaby_testdata.txt (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) Merge branch 'master' into ticket-1111