# # ChangeLog for test in sasview # # Generated by Trac 1.0.1 # Nov 25, 2024 12:12:11 AM 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. Sat, 05 May 2018 05:23:09 GMT Stuart Prescott [6ef75fa6] * test/corfunc/test/utest_corfunc.py (modified) Fix race condition in test transform_isrunning() returns False both ... Mon, 09 Apr 2018 16:00:41 GMT krzywon [63ddc03] * src/sas/sasgui/perspectives/calculator/model_editor.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/test/1d_data/10000A_sphere_dsm.xml (moved) * test/sascalculator/test/utest_sas_gen.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 branch 'master' into ticket-1068-2 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. ... Sat, 10 Mar 2018 13:21:33 GMT Stuart Prescott [39a018b] * test/sascalculator/test/utest_sas_gen.py (modified) Fix finding of test resource 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:41:43 GMT krzywon [3ee0451] * test/sasdataloader/test/FEB18012.ASC (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) Unit test for error message handling with 'deprecated' data sets. 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 ... Wed, 03 Jan 2018 14:50:17 GMT krzywon [db5196d] * test/sasdataloader/test/nans_in_1d_data.dat (moved) * test/sasdataloader/test/nans_in_2d_data.DAT (added) * test/sasdataloader/test/utest_ascii.py (modified) Add unit tests for removal of nans from 2D data. Change test file names ... Fri, 22 Dec 2017 16:38:19 GMT krzywon [cc62607] * test/sasdataloader/test/test_data_nan_values.dat (added) * test/sasdataloader/test/utest_ascii.py (modified) Add unit tests to show nan values are coerced to 0. refs #1037 Thu, 21 Dec 2017 14:27:49 GMT krzywon [fa749b7] * test/sasdataloader/test/sam14_cor.ABS (added) * test/sasdataloader/test/sam14_cor.cor (added) * test/sasdataloader/test/utest_abs_reader.py (modified) Add USANS files (.abs and .cor) with negative dxl values and unit tests ... 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:31:07 GMT Paul Kienzle [f53d684] * pytest.ini (added) * 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_sas_gen.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) Make tests work from any directory and functional without special runner ... 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 Wed, 01 Nov 2017 11:06:50 GMT Stuart Prescott [c16ffe7] * test/fileconverter/test/utest_nxcansas_writer.py (modified) Remove unused pylint import in test Wed, 25 Oct 2017 14:58:11 GMT krzywon [3648cbf] * test/sasdataloader/test/utest_generic_file_reader_class.py (modified) FIx failing unit tests on file reader base class. Wed, 25 Oct 2017 11:11:21 GMT krzywon [fe15198] * 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_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Add unit tests to be sure the correct number of data sets are returned ... Sat, 23 Sep 2017 17:06:57 GMT Paul Kienzle [1cdbcd8] * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) move tests to use sasmodels rather than sas.models (tests will still ... Sat, 23 Sep 2017 16:30:40 GMT Paul Kienzle [f00072f] * test/sasdataloader/test/utest_cansas.py (modified) update cansas reader tests for python 3 Sat, 23 Sep 2017 15:25:06 GMT Paul Kienzle [a50da82] * test/sascalculator/test/utest_sld.py (moved) enable periodictable tests Sat, 23 Sep 2017 06:08:08 GMT Paul Kienzle [1d014cb] * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) sas_gen tests now pass cleanly Sat, 23 Sep 2017 05:49:08 GMT Paul Kienzle [9e308a3] * test/run_one.py (modified) * test/utest_sasview.py (modified) tweak utests so it is slightly easier to identify and run failing tests Fri, 22 Sep 2017 23:40:41 GMT Paul Kienzle [7b50f14] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) restore python 2 functionality Fri, 22 Sep 2017 23:02:03 GMT Paul Kienzle [56dac0b] * test/sasdataloader/test/utest_cansas.py (modified) py3 doesn't have StringIO package Fri, 22 Sep 2017 20:01:32 GMT Paul Kienzle [574adc7] * src/sas/sascalc/calculator/BaseComponent.py (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/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/odict.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/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/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/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/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) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/utest_sasview.py (modified) convert sascalc to python 2/3 syntax Wed, 20 Sep 2017 11:55:53 GMT Paul Kienzle [13374be] * sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_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/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/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/plot_labels.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * 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/utest_sasview.py (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * 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) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge branch 'master' into 4_1_issues Tue, 19 Sep 2017 18:34:04 GMT pkienzle [86ba9d6] * test/corfunc/test/utest_corfunc.py (modified) suppress test of corfunc for now Tue, 19 Sep 2017 18:07:00 GMT Paul Kienzle [932519a] * sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_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/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/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_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/plot_labels.py (modified) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/utest_sasview.py (modified) Merge branch 'master' into corfunc3d Tue, 19 Sep 2017 17:02:20 GMT Paul Kienzle [1f21a43] * 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) more complete corfunc test Mon, 18 Sep 2017 13:46:28 GMT Paul Kienzle [be51cf6] * test/corfunc/test/utest_corfunc.py (modified) * test/utest_sasview.py (modified) fix corfunc tests Fri, 15 Sep 2017 18:48:18 GMT krzywon [ae69c690] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Ensure dxl and dxw and the same length as each other and as x. Wed, 13 Sep 2017 14:27:29 GMT lewis [5c1c486] * .pydevproject (modified) * README.md (modified) * 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) * src/sas/sascalc/dataloader/data_info.py (modified) * 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/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * 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/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * 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_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/utest_sasview.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * test/corfunc/test/utest_corfunc.py (modified) Merge branch 'master' into 4.2.0-fixes Thu, 07 Sep 2017 18:28:11 GMT krzywon [7582df3] * 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) * test/sasdataloader/test/AR07232_rest.ASC (deleted) Remove example .ASC files that used the IgorReader. Thu, 07 Sep 2017 18:04:43 GMT krzywon [a78a02f] * 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) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Make suggested changes for unit test fixes. Wed, 30 Aug 2017 16:42:53 GMT Paul Kienzle [b54440d] * test/utest_sasview.py (modified) identify tests with any mixture of errors and failures Fri, 25 Aug 2017 20:16:14 GMT krzywon [d713729] * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) Fix the danse_reader and remove obsolete unit tests. Fri, 25 Aug 2017 13:16:43 GMT lewis [968d67e] * test/corfunc/test/utest_corfunc.py (modified) Fix corfunc unit test Thu, 24 Aug 2017 18:16:07 GMT krzywon [17e257b5] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Fix the broken unit tests associated with the readers. Mon, 21 Aug 2017 14:16:13 GMT lewis [dcb91cf] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/valid_cansas_xml.xml (added) Make suggested changes Mon, 21 Aug 2017 08:51:20 GMT lewis [44daa56] * docs/sphinx-docs/build_sphinx.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/invertor.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.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) * test/pr_inversion/test/utest_invertor.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.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/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/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.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) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * 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_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'master' into ticket-876 Fri, 04 Aug 2017 08:56:58 GMT lewis [ce8c7bd] * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) Remove support for loading .d1d files HFIR no longer use the .d1d ... Fri, 04 Aug 2017 08:22:51 GMT lewis [cb62bd5] * 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/invertor.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) Use manually inputted background level in Pr calculation Wed, 02 Aug 2017 11:34:00 GMT lewis [4dd90bf] * test/sasdataloader/test/utest_abs_reader.py (modified) Remove invalid import Wed, 02 Aug 2017 09:37:27 GMT lewis [2a52b0e] * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Remove unit test reliance on IgorReader Tue, 01 Aug 2017 16:02:35 GMT lewis [5a8cdbb] * check_packages.py (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (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/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.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/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testplugings.py (modified) * 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_sesans.py (added) * test/sasdataloader/test/write_test.xml (deleted) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * setup.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/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/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'master' into ticket-876 Tue, 01 Aug 2017 15:36:38 GMT lewis [248ff73] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) Ensure unit tests pass utest_averaging still fails as it relies on ... Thu, 18 May 2017 19:16:57 GMT GitHub [7132e49] * run.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge pull request #77 from SasView/log_binning Closes #920 Wed, 17 May 2017 20:53:56 GMT Ricardo M. Ferraz Leal [e123eb9] * test/sasdataloader/test/utest_averaging.py (modified) Test only for the log binning Tue, 16 May 2017 12:16:20 GMT GitHub [2f17d40] * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (added) * .gitignore (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (modified) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/wxcruft.py (modified) * setup.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (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/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.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/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/fileconverter/test/export2d.h5 (deleted) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (deleted) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) Merge pull request #76 from rprospero/master Update SESANS reader to ... Tue, 02 May 2017 15:24:16 GMT krzywon [371b9e2] * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Add support for a fourth reader exception and start the removal of ... Tue, 02 May 2017 12:07:40 GMT Paul Kienzle [5e903e8b] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (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/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.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/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (deleted) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * run.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) Merge branch 'master' into log_binning Mon, 01 May 2017 21:41:32 GMT andyfaff [c551bb3] * test/sasdataloader/test/utest_abs_reader.py (modified) TST: ensure specific readers work Mon, 01 May 2017 04:42:59 GMT andyfaff [aaf5e49] * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) MAINT: few more print instances Tue, 18 Apr 2017 18:56:03 GMT krzywon [ad92c5a] * 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) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) ABS reader converted to new system. Mon, 17 Apr 2017 19:16:39 GMT krzywon [8ffafd1] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Fix indexing issue that broke unit tests. Mon, 17 Apr 2017 18:39:50 GMT krzywon [b09095a] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Refactor ASCII reader to use FileReader class. Mon, 17 Apr 2017 16:21:58 GMT krzywon [1fc50fb2] * test/sasdataloader/test/utest_cansas.py (modified) Unit test to be sure written file exists before trying to open it. Sun, 16 Apr 2017 17:01:30 GMT Paul Kienzle [6c497b7] * .gitignore (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * check_packages.py (modified) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (modified) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.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/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.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/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_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/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.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/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.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/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.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/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.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_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/fileconverter/test/export2d.h5 (deleted) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) Merge branch 'master' into log_binning Tue, 11 Apr 2017 16:05:55 GMT krzywon [beba407] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) Start of a base file loading class and a couple unit tests for it. Tue, 11 Apr 2017 14:31:54 GMT krzywon [17c9436] * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (deleted) Remove all files dynamically genereated during unit testing. Mon, 10 Apr 2017 15:13:08 GMT Adam Washington [6082048] * test/sasdataloader/test/sesans_examples/next_gen.ses (modified) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (modified) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (modified) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (modified) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (modified) Fix line endings on sesans unit tests Mon, 10 Apr 2017 15:06:20 GMT Adam Washington [a67c494] * test/sasdataloader/test/utest_sesans.py (modified) Include SESANS unit test that users the full loader infrastructure We ... Mon, 10 Apr 2017 15:02:49 GMT Adam Washington [4b5f2657] * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (modified) Fix stupid paste error in sesans test data Mon, 10 Apr 2017 15:01:14 GMT Adam Washington [8938502] * check_packages.py (modified) * sasview/local_config.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.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/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.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/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_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/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.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/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.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/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.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_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge branch 'master' of github.com:SasView/sasview Sun, 09 Apr 2017 22:00:10 GMT andyfaff [ecdd132] * .gitignore (modified) * test/fileconverter/test/export2d.h5 (deleted) MAINT: ignore file created by test Sun, 09 Apr 2017 10:30:10 GMT andyfaff [45dffa69] * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: more 'not x is None' fixes Sun, 09 Apr 2017 10:11:31 GMT andyfaff [7432acb] * sasview/welcome_panel.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/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.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/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.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_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.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/transform.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) MAINT: search+replace '!= None' by 'is not None' Sun, 09 Apr 2017 10:08:43 GMT andyfaff [ac07a3a] * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: replace 'not x is None' by 'x is not None' Sun, 09 Apr 2017 09:46:10 GMT andyfaff [235f514] * check_packages.py (modified) * sasview/setup_mac.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.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/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_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/pr/fit/AbstractFitEngine.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/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.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/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.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_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: replace '== None' by 'is None' Sun, 09 Apr 2017 09:31:32 GMT Adam Washington [35cf5c0] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Test that SASView complains if SES columns do not match headers Sun, 09 Apr 2017 09:24:21 GMT Adam Washington [e801a4e] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Test that SESANS files insist on proper headers Sun, 09 Apr 2017 09:13:18 GMT Adam Washington [a81af92] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Reject time travelling SESANS files Sun, 09 Apr 2017 09:09:13 GMT Adam Washington [f344f6c] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Throw exception if SES file has not version data Sun, 09 Apr 2017 09:08:48 GMT Adam Washington [5ae40e7] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Throw an exception if sesans file has conflicting units We've decided ... Sun, 09 Apr 2017 09:00:29 GMT Adam Washington [10ab40e] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Throw an exception if sesans file is missing necessary units Sun, 09 Apr 2017 08:40:35 GMT Adam Washington [ade1080] * test/sasdataloader/test/utest_sesans.py (modified) Call the sesans reader directly in unit test Sun, 09 Apr 2017 08:12:59 GMT Adam Washington [a79ab31] * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Start testing invalid sesans files Sun, 09 Apr 2017 08:03:36 GMT Adam Washington [4d465e3] * .gitattributes (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.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) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/media/README.txt (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/Loader.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/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.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/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.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/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.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_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (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/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge branch 'master' of github.com:SasView/sasview Sun, 09 Apr 2017 07:55:42 GMT Adam Washington [aa45dcd] * test/sasdataloader/test/sesans_examples/sphere2micron.ses (moved) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (moved) * test/sasdataloader/test/utest_sesans.py (modified) Move sesans test data into subdirectory Sat, 08 Apr 2017 12:47:39 GMT Ricardo Ferraz Leal [c0ca2e3d] * .gitattributes (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.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) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/Loader.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/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.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/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.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/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.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_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (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/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * run.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) After merging conflict with master CR/LF Sat, 08 Apr 2017 08:37:19 GMT ajj [959eb01] * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.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) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/Loader.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/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.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/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.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/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.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_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) normalising line endings Fri, 07 Apr 2017 13:51:47 GMT Ricardo Ferraz Leal [fa4af76] * src/sas/sascalc/dataloader/manipulations.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) Refactoring Fri, 07 Apr 2017 04:03:53 GMT andyfaff [6435594] * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * test/fileconverter/test/export2d.h5 (modified) MAINT: improving dict access Fri, 07 Apr 2017 02:15:08 GMT andyfaff [f3bf622] * setup.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/sasdataloader/test/testplugings.py (modified) MAINT: remove has_key occurences Thu, 06 Apr 2017 16:24:09 GMT Adam Washington [7e56311] * test/sasdataloader/test/sphere_isis.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) More tests on TOF Sesans Thu, 06 Apr 2017 15:04:42 GMT Ricardo Ferraz Leal [fd5d6eac] * src/sas/sascalc/dataloader/manipulations.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) better code. Remove warnings Thu, 06 Apr 2017 15:03:54 GMT Adam Washington [ebed4de] * test/sasdataloader/test/utest_sesans.py (modified) Start adding TOF file Thu, 06 Apr 2017 15:03:06 GMT Adam Washington [eb5f006] * test/sasdataloader/test/sphere2micron.ses (moved) * test/sasdataloader/test/utest_sesans.py (modified) Update unit test with new test file Thu, 06 Apr 2017 08:36:51 GMT Adam Washington [3c903ea] * .gitignore (modified) * run.py (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/logging.ini (added) * sasview/sasview.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/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * 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/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (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/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/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/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/logging.ini (added) * test/run_one.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (modified) * test/utest_sasview.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sphere3micron.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge branch 'master' of github.com:SasView/sasview Wed, 05 Apr 2017 17:15:25 GMT Ricardo Ferraz Leal [00a6ec4] * .gitignore (modified) * .travis.yml (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * test/logging.ini (modified) * test/run_one.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/utest_sasview.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Merge remote-tracking branch 'origin' into log_binning Wed, 05 Apr 2017 17:14:41 GMT Ricardo Ferraz Leal [4fb10e5] * test/sasdataloader/test/utest_averaging.py (modified) Added absolute paths to the files Wed, 05 Apr 2017 14:55:17 GMT Ricardo Ferraz Leal [aaad4c95] * .gitignore (modified) * test/logging.ini (modified) * test/run_one.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/utest_sasview.py (modified) Log for tests is now on the test directory Wed, 05 Apr 2017 14:53:34 GMT Adam Washington [bfd34a7] * test/sasdataloader/test/utest_sesans.py (modified) Test that .SES files are tagged as Sesans Wed, 05 Apr 2017 14:33:21 GMT Adam Washington [2b310602] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sphere3micron.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Update SESANS reader to SESANS format v1.0 Wed, 05 Apr 2017 11:59:04 GMT Ricardo Ferraz Leal [ebb0a55] * test/logging.ini (modified) * test/utest_sasview.py (modified) Log for tests working now Wed, 05 Apr 2017 11:24:44 GMT Ricardo Ferraz Leal [64ca561] * run.py (modified) * sasview/logging.ini (modified) * sasview/sasview.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * test/logging.ini (modified) * test/run_one.py (modified) Log not repeated any longer Tue, 04 Apr 2017 17:10:30 GMT Ricardo Ferraz Leal [f2940c4] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * .gitignore (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/logging.ini (added) * sasview/sasview.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/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * 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/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (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/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/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/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/logging.ini (added) * test/run_one.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (modified) * test/utest_sasview.py (modified) Merge branch 'master' of github.com:SasView/sasview into logger Tue, 04 Apr 2017 17:00:50 GMT ajj [dd11014] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Fixing PR #55 broken merge Tue, 04 Apr 2017 16:50:04 GMT Ricardo Ferraz Leal [9c0f3c17] * check_packages.py (modified) * mac_setup_homebrew.sh (added) * run.py (modified) * sasview/local_config.py (modified) * sasview/logging.ini (modified) * setup.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_panel.py (modified) * src/examples/test_panel2D.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (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/err1d.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_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/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/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/BumpsFitting.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/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/images/dls_logo.png (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.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/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (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/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.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) * .gitignore (modified) * sasview/__init__.py (modified) * sasview/sasview.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.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/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (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/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/logging.ini (added) * test/run_one.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/write_test.xml (modified) * test/utest_sasview.py (modified) After merge conflict Tue, 04 Apr 2017 16:39:42 GMT Ricardo Ferraz Leal [463e7ffc] * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/logging.ini (modified) * sasview/sasview.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/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * 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/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (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/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/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/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * test/run_one.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/utest_sasview.py (modified) getLogger with module name