# # ChangeLog for src/sas/sascalc in sasview # # Generated by Trac 1.0.1 # Nov 25, 2024 3:25:44 PM 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 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. 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 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. 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. 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. 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 ... 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: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 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 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 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. Thu, 13 Sep 2018 17:54:54 GMT krzywon [feec1cb] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) Differentiate between scalars and arrays. Thu, 13 Sep 2018 15:33:22 GMT krzywon [2ca5d57b] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (modified) * test/sasdataloader/test/utest_cansas.py (modified) Code cleanup and additional unit tests. Wed, 12 Sep 2018 19:13:34 GMT krzywon [4fdcc65] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * test/sasdataloader/test/test_data/MAR07232_rest.h5 (modified) File loader fixes and code cleanup. Tue, 11 Sep 2018 15:47:02 GMT krzywon [8d5e11c] * 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) File loader code cleanup. Mon, 10 Sep 2018 20:25:38 GMT krzywon [9dc1500] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Take value directly instead of slice to avoid value errors. Mon, 10 Sep 2018 12:09:38 GMT krzywon [c2525bf] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Properly load in 2D data using attributes from the NXcanSAS reader. Tue, 21 Aug 2018 13:20:27 GMT krzywon [35ac8df] * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/environment.rst (added) * docs/sphinx-docs/source/user/working.rst (modified) * installers/README-next-release.txt (modified) * installers/README.txt (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/fit/pagestate.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/perspectives/calculator/pyconsole.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/sasview/__init__.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.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_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) Merge branch 'master' into ticket-1111 Thu, 09 Aug 2018 23:20:21 GMT GitHub [636cf8d] * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge pull request #162 from SasView/beta_load_project Beta Load ... Wed, 01 Aug 2018 13:51:17 GMT krzywon [59873e1] * src/sas/sascalc/fit/pagestate.py (modified) Remove any non-numeric characters from the version number when loading ... Thu, 26 Jul 2018 12:06:56 GMT krzywon [bd5c3b1] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Use q_mean from ABS files to match Igor analysis. Tue, 24 Jul 2018 18:22:13 GMT krzywon [96d06a4] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasdata.h5 (modified) * test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry_multisasdata.h5 (modified) Separate 1d and 2d data processing, and add new NXcanSAS compliant data ... Fri, 13 Jul 2018 20:22:31 GMT krzywon [cf29187] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasdata.h5 (modified) * test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry.h5 (modified) * test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry_multisasdata.h5 (modified) Fix typo in writer, output new files, and fix reader to properly read in ... Thu, 12 Jul 2018 01:25:34 GMT krzywon [0bd8fac] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.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) Code cleanup and removal of non-standard NXcanSAS files. Wed, 11 Jul 2018 15:33:00 GMT krzywon [ac38ab4] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Save process and transmission spectrum and fix issues with loading them. Mon, 09 Jul 2018 20:51:03 GMT krzywon [fc51d06] * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) Fix broken unit tests and general cleanup. Mon, 09 Jul 2018 20:16:05 GMT krzywon [b011ecb] * src/sas/sascalc/data_util/nxsunit.py (modified) Fix conversion factor in nxunit. Mon, 09 Jul 2018 20:02:50 GMT krzywon [369ed11d] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Save dQ values as resolutions, not uncertainties. refs #1129 Mon, 09 Jul 2018 20:02:07 GMT krzywon [02c1608e] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Allow for multiple Q resolutions/uncertainties for USANS data. refs #976 Mon, 09 Jul 2018 18:57:09 GMT krzywon [f5483ef] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Save uncertainties and resolutions, but only if they are present in the ... Fri, 06 Jul 2018 20:10:27 GMT krzywon [cf820f5] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Give proper label to NXcanSAS data files in file browser window. refs ... Fri, 06 Jul 2018 18:23:21 GMT krzywon [8f882fe] * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Changes to NXcanSAS reader to comply with specification. refs #976 Fri, 22 Jun 2018 20:33:42 GMT krzywon [058f6c3] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) Fixes for failing ascii, cansasXML, red2D, and sesans reader unit tests. Fri, 22 Jun 2018 16:52:36 GMT krzywon [3bab401] * 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/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) Create a universal unit converter for all data loaders. refs #1111 Thu, 21 Jun 2018 18:04:35 GMT krzywon [c7634fd] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * build_tools/requirements.txt (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * setup.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasview/sasview.py (modified) * src/sas/sasview/test/1d_data/10000A_sphere_dsm.xml (moved) * test/corfunc/test/utest_corfunc.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sasdataloader/test/FEB18012.ASC (added) * test/sasdataloader/test/test_data/TestExtensions (added) * test/sasdataloader/test/test_data/TestExtensions.asc (added) * test/sasdataloader/test/test_data/TestExtensions.notxml (added) * test/sasdataloader/test/test_data/TestExtensions.nxs (added) * test/sasdataloader/test/test_data/TestExtensions.xml (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) Merge branch 'ticket-976' into ticket-1111 Tue, 17 Apr 2018 13:29:25 GMT GitHub [1176137] * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * build_tools/requirements.txt (modified) * setup.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/sasdataloader/test/FEB18012.ASC (added) * test/sasdataloader/test/test_data/TestExtensions (added) * test/sasdataloader/test/test_data/TestExtensions.asc (added) * test/sasdataloader/test/test_data/TestExtensions.notxml (added) * test/sasdataloader/test/test_data/TestExtensions.nxs (added) * test/sasdataloader/test/test_data/TestExtensions.xml (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) Merge pull request #149 from SasView/ticket-1079 Removing save button ... Mon, 09 Apr 2018 08:46:38 GMT wojciech [3b070a0] * src/sas/sascalc/fit/pagestate.py (modified) fixed imaged width for win Mon, 09 Apr 2018 08:07:25 GMT wojciech [47c44f0] * src/sas/sascalc/fit/pagestate.py (modified) Reverting Windows page layout Thu, 05 Apr 2018 07:26:35 GMT wojciech [a8e368b] * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) Fixing width for printing Wed, 04 Apr 2018 20:14:46 GMT wojciech [5818dae] * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Reverted save button as potential solution to the problem has been found Tue, 27 Mar 2018 16:05:36 GMT krzywon [4a8d55c] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * test/sasdataloader/test/test_data/TestExtensions (added) * test/sasdataloader/test/test_data/TestExtensions.asc (added) * test/sasdataloader/test/test_data/TestExtensions.notxml (added) * test/sasdataloader/test/test_data/TestExtensions.nxs (added) * test/sasdataloader/test/test_data/TestExtensions.xml (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) Propagate through loader when errors are thrown regardless of the error. ... Wed, 07 Mar 2018 14:39:18 GMT krzywon [2924532] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Cleanup of the SasView GUI data loader error handling and a more ... Thu, 15 Feb 2018 15:28:55 GMT krzywon [425feff] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) Move the deprecation check so it is always called, regardless of file ... Wed, 14 Feb 2018 18:23:29 GMT krzywon [c36c09f] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Show a dialog warning the user the data set may not load properly. All ... Tue, 23 Jan 2018 15:35:39 GMT krzywon [6bd4235] * .gitignore (modified) * build_tools/conda/ymls/sasview-env-build_linux.yml (added) * build_tools/conda/ymls/sasview-env-build_osx.yml (added) * build_tools/conda/ymls/sasview-env-build_win.yml (added) * installers/installer_generator.py (modified) * installers/sasview.spec (modified) * installers/version.txt (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/associations.py (modified) * src/sas/sasgui/guiframe/images/Thumbs.db (deleted) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasview/images/dls_logo.png (modified) * src/sas/sasview/images/tudelft_logo.png (modified) * src/sas/sasview/test/1d_data/saxess_example.pdh (modified) * test/sasdataloader/test/nans_in_1d_data.dat (added) * test/sasdataloader/test/nans_in_2d_data.DAT (added) * test/sasdataloader/test/sam14_cor.ABS (added) * test/sasdataloader/test/sam14_cor.cor (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Merge branch 'master' into ticket-976 Tue, 23 Jan 2018 15:34:37 GMT krzywon [18af6d2] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Clear data locations when a new data set is created and coerce I and Q ... Thu, 11 Jan 2018 13:29:18 GMT GitHub [a40e913] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * test/sasdataloader/test/nans_in_1d_data.dat (added) * test/sasdataloader/test/nans_in_2d_data.DAT (added) * test/sasdataloader/test/utest_ascii.py (modified) * .gitignore (modified) * build_tools/conda/ymls/sasview-env-build_linux.yml (added) * build_tools/conda/ymls/sasview-env-build_osx.yml (added) * build_tools/conda/ymls/sasview-env-build_win.yml (added) * installers/sasview.spec (modified) * installers/version.txt (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sasgui/guiframe/images/Thumbs.db (deleted) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasview/images/dls_logo.png (modified) * src/sas/sasview/images/tudelft_logo.png (modified) * src/sas/sasview/test/1d_data/saxess_example.pdh (modified) * test/sasdataloader/test/sam14_cor.ABS (added) * test/sasdataloader/test/sam14_cor.cor (added) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge pull request #135 from SasView/ticket-1037 Ticket 1037: Remove ... Tue, 09 Jan 2018 17:13:25 GMT krzywon [a58b5a0] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Update documentation to match code. Thu, 04 Jan 2018 21:09:49 GMT krzywon [340291a] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Fix nan removal code to truncate search through and truncate 2D mask ... Wed, 03 Jan 2018 19:09:40 GMT krzywon [6fd7b20] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Simplified nan removal code. Wed, 03 Jan 2018 14:43:28 GMT krzywon [f02a0c6] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Extend nan removal to 2D data. Wed, 03 Jan 2018 13:41:36 GMT krzywon [e3133dc] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Remove nan values from data 1D objects instead of coercing to 0. Tue, 02 Jan 2018 14:29:58 GMT krzywon [5a4d022] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Remove instance variables from class definition. Fri, 22 Dec 2017 17:08:53 GMT krzywon [d7fd7be] * .gitignore (modified) * .pydevproject (modified) * README.md (modified) * build_tools/conda/periodictable/meta.yaml (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/requirements.txt (modified) * build_tools/travis_build.sh (modified) * check_packages.py (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/dollarmath.py (modified) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/rst_prolog (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * pytest.ini (added) * run.py (modified) * sasview/__init__.py (deleted) * sasview/sasview.py (deleted) * sasview/setup_mac.py (deleted) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/examples/test_panel2D.py (modified) * src/sas/__init__.py (modified) * src/sas/_config.py (added) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.h (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/librefl.h (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.c (moved) * src/sas/sascalc/calculator/c_extensions/sld2i.h (added) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (added) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (deleted) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.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/odict.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/data_util/uniquelist.py (deleted) * src/sas/sascalc/dataloader/__init__.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_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/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/file_converter/otoko_loader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/models.py (added) * src/sas/sascalc/fit/pagestate.py (moved) * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sascalc/fit/qsmearing.py (moved) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.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/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (deleted) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (deleted) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.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/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image001.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image002.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image003.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image004.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image005.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image006.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image007.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image008.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image009.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image010.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image011.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image012.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image013.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (deleted) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.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/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/dls_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (added) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (added) * src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (added) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83000.xml (added) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98000.xml (added) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) * test/__init__.py (added) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/corfunc/test/utest_corfunc.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_sld.py (moved) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * 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_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasguiframe/test/utest_manipulations.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) * test/utest_sasview.py (modified) Merge branch 'master' into ticket-976 Fri, 22 Dec 2017 16:37:19 GMT krzywon [8475d16] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Coerce all nan values to 0 when loading data files. refs #1037 Tue, 19 Dec 2017 16:59:42 GMT krzywon [e3775c6] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) Use startswith instead of count for line matching in ABS reader. Tue, 19 Dec 2017 14:59:00 GMT krzywon [a32c19c] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) Associate .cor files with the ABS reader. If they are in XMl format, ... Tue, 19 Dec 2017 14:51:50 GMT krzywon [11112b2] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) Properly handle negative dx values in the ABS reader. Wed, 06 Dec 2017 16:04:17 GMT GitHub [5bb05a4] * run.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/__init__.py (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.h (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/librefl.h (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.c (moved) * src/sas/sascalc/calculator/c_extensions/sld2i.h (added) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (moved) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sasview/test/convertible_files/Z83000.xml (added) * src/sas/sasview/test/convertible_files/Z98000.xml (added) * test/sascalculator/test/utest_sas_gen.py (modified) * pytest.ini (added) * src/sas/sascalc/dataloader/file_reader_base_class.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/sesans_reader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/qsmearing.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/__init__.py (added) * test/corfunc/test/utest_corfunc.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * 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_extension_registry.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/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge pull request 127 from SasView/ticket-1032-sldi. Closes #1032. Tue, 05 Dec 2017 17:29:37 GMT GitHub [3053a4a] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) remove infinite loop from sesans reader (#129) Tue, 05 Dec 2017 13:54:20 GMT GitHub [79c9ce5] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * docs/sphinx-docs/source/_extensions/dollarmath.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/qsmearing.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge pull request #122 from llimeht/tmp/filereader-class Fix instance ... Thu, 30 Nov 2017 16:00:44 GMT Paul Kienzle [0a9cbc3] * src/sas/sascalc/fit/MultiplicationModel.py (modified) update old MultiplicationModel so that fun_list defaults to list Mon, 20 Nov 2017 18:15:52 GMT Paul Kienzle [2469df7] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/fit/qsmearing.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) lint: update 'if x==True/False' to 'if x/not x:' Tue, 14 Nov 2017 15:57:07 GMT Paul Kienzle [144e032a] * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.h (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/librefl.h (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) tinycc doesn't return structures, so must pass return structure as ... Mon, 13 Nov 2017 23:04:31 GMT Paul Kienzle [a57ae07] * src/sas/sascalc/calculator/c_extensions/__init__.py (modified) use LF rather than CRLF in .c/.h files Mon, 13 Nov 2017 23:02:21 GMT Paul Kienzle [a1daf86] * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) hack around broken isfinite/isnan in tinycc Mon, 13 Nov 2017 16:51:56 GMT Paul Kienzle [7e82256] * src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) declare all variables at the start of the block so C89 compilers don't ... Tue, 07 Nov 2017 18:21:18 GMT Paul Kienzle [f926abb] * src/sas/sascalc/calculator/sas_gen.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) add smoke test for generic scattering calculator Tue, 07 Nov 2017 18:05:12 GMT Paul Kienzle [54b0650] * src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.h (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) fix C interface to sldi after py3 conversion Tue, 07 Nov 2017 15:00:25 GMT Paul Kienzle [0957bb3a] * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.c (moved) * src/sas/sascalc/calculator/c_extensions/sld2i.h (added) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (deleted) * src/sas/sascalc/calculator/c_extensions/sld2i_module.c (moved) convert sldi from C++ to C Sat, 04 Nov 2017 13:20:24 GMT Stuart Prescott [cb11a25] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Fix instance vs class variables in FileReader Class variables get ... Fri, 03 Nov 2017 14:11:12 GMT Stuart Prescott [90961b4] * src/sas/sascalc/data_util/uniquelist.py (deleted) Delete unreferenced file uniquelist.py Thu, 02 Nov 2017 09:21:47 GMT Stuart Prescott [20fa5fe] * src/examples/test_panel2D.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/file_converter/otoko_loader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasview/sasview.py (modified) Fix lots more typos in comments and docs Thu, 02 Nov 2017 09:01:33 GMT Stuart Prescott [f4775563] * src/sas/sascalc/calculator/instrument.py (modified) Fix spelling in docstring Thu, 02 Nov 2017 06:58:20 GMT Stuart Prescott [a52f32f] * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) Fix typo in P(r) peaks description Fri, 27 Oct 2017 07:39:38 GMT krzywon [1576693] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Move state reset to end of file read to be more thread friendly. Wed, 25 Oct 2017 09:46:56 GMT krzywon [61f329f0] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Reset file reader class data state each time a new data file is loaded. Thu, 28 Sep 2017 22:40:02 GMT Paul Kienzle [c22b621] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_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/M_angles_pic.png (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (deleted) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image001.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image002.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image003.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image004.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image005.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image006.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image007.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image008.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image009.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image010.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image011.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image012.png (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_image013.jpg (deleted) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sld1.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (deleted) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) Merge branch 'py3' into ticket-947-sasmodels-docs Thu, 28 Sep 2017 22:17:46 GMT Paul Kienzle [a26f67f] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/file_converter/c_ext/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) fixup api doc errors Thu, 28 Sep 2017 19:40:02 GMT krzywon [2b538cd] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Modify documentation and add instance check for numpy arrays in HDF5 ... Wed, 27 Sep 2017 14:50:34 GMT Paul Kienzle [b916afa] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added) * build_tools/conda/periodictable/meta.yaml (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/requirements.txt (modified) * check_packages.py (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/odict.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/__init__.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/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_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/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasview/sasview.py (modified) * test/run_one.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_sld.py (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) Merge branch 'ticket-853-fit-gui-to-calc' into py3 Wed, 27 Sep 2017 14:50:02 GMT Paul Kienzle [9be22cd] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added) * installers/setup_exe.py (modified) * installers/setup_mac.py (modified) * src/sas/__init__.py (modified) * src/sas/_config.py (added) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/models.py (added) * src/sas/sascalc/fit/pagestate.py (moved) * src/sas/sascalc/fit/qsmearing.py (moved) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (deleted) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.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/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (deleted) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/sasview.py (modified) * src/sas/sasview/welcome_panel.py (modified) Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc Wed, 27 Sep 2017 14:49:33 GMT Paul Kienzle [83db1cc] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added) * .gitignore (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/__init__.py (deleted) * sasview/sasview.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.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/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/dls_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (added) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (added) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (added) * src/sas/sasview/test/2d_data/MAR07262.ASC (added) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (added) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved) * src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'ticket-869' into ticket-887-reorg Wed, 27 Sep 2017 14:47:44 GMT Paul Kienzle [4b001f3] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified) * src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added) * sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved) * sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved) * src/sas/sascalc/dataloader/data_info.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/cansas_reader.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) Merge branch 'master' into ticket-915 Tue, 26 Sep 2017 19:16:36 GMT Paul Kienzle [1efbc190] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sasgui/guiframe/config.py (modified) fix merge errors Tue, 26 Sep 2017 19:16:21 GMT Paul Kienzle [b58265c3] * src/sas/sascalc/calculator/sas_gen.py (modified) use logger rather than print for error notifications