#
# ChangeLog for src/sas/sasgui/perspectives in sasview
#
# Generated by Trac 1.0.1
# Dec 25, 2024 2:34:35 PM

Tue, 18 Jul 2017 15:46:10 GMT lewis [c728295]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)

	Remove unused argument and import


Tue, 18 Jul 2017 15:01:22 GMT lewis [7dda833]
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)

	Change IDF label


Tue, 18 Jul 2017 14:55:35 GMT lewis [37d53225]
	* 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/plot_labels.py (modified)

	Implement computation of IDF


Mon, 17 Jul 2017 13:57:08 GMT lewis [7cde638]
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)

	Tidy up plotting of gamma3


Mon, 17 Jul 2017 13:53:16 GMT lewis [22194b1]
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)

	Only calculate gamma3 up to x=200, as this is all that's plotted


Tue, 11 Jul 2017 15:59:44 GMT lewis [412c509]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)

	Compute 3D correlation function as well as 1D


Tue, 11 Jul 2017 09:05:13 GMT lewis [457f735]
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)

	Refactor in preparation for 3D transform


Tue, 11 Jul 2017 08:39:40 GMT lewis [03e3902]
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)

	Format Gamma plot labels


Fri, 09 Jun 2017 19:13:46 GMT Paul Kienzle <pkienzle@…> [444a657]
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sascalc/dataloader/manipulations.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/perspectives/fitting/basepage.py (modified)

	Merge branch 'master' into batch_slicer


Tue, 30 May 2017 16:15:23 GMT GitHub <noreply@…> [8cec26b]
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* run.py (modified)
	* 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/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.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/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_averaging.py (modified)
	* test/sasdataloader/test/utest_sesans.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)

	Merge pull request #80 from SasView/ticket-866

	Ticket 866. As per ...


Thu, 18 May 2017 19:21:33 GMT krzywon [9e2535e]
	* run.py (modified)
	* 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/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.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/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_averaging.py (modified)
	* test/sasdataloader/test/utest_sesans.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)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.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/perspectives/fitting/basepage.py (modified)

	Merge branch 'master' into batch_slicer


Tue, 16 May 2017 12:19:57 GMT GitHub <noreply@…> [81b1f4d]
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* .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/test/sesans_data/sphere2micron.ses (modified)
	* sasview/test/sesans_data/sphere_isis.ses (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/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/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.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/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/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/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_cansas.py (modified)
	* test/sasdataloader/test/utest_sesans.py (added)
	* 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 #85 from rprospero/findModels_tidy

	Tidy up the ...


Tue, 16 May 2017 11:56:13 GMT Adam Washington <adam.washington@…> [56a282c]
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	Renamed _findModels to the more pythonic _find_models

	Used grep to ...


Mon, 15 May 2017 14:22:05 GMT Gonzalez, Miguel <gonzalez@…> [87ac6eb]
	* .gitattributes (modified)
	* .gitignore (modified)
	* Vagrantfile (modified)
	* Vagrantprovision.sh (modified)
	* check_packages.py (modified)
	* docs/pandoc-docs/Makefile (added)
	* docs/pandoc-docs/build_pandoc.py (added)
	* docs/pandoc-docs/source/README.txt (added)
	* 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/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)
	* run.py (modified)
	* sasview/custom_config.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/welcome_panel.py (modified)
	* sasview/wxcruft.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/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/formatnum.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/__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_constants.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/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/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/fit/expression.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/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (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/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/config.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_processor.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/AnnulusSlicer.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/SlicerParameters.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/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/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/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/proxy.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/pyconsole.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/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/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/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.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_state.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/ShapeParameters.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/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.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/plottables.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 (deleted)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_explorer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/run_one.py (modified)
	* test/sascalculator/test/utest_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/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/testLoad.py (modified)
	* test/sasdataloader/test/testplugings.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_red2d_reader.py (modified)
	* test/sasdataloader/test/write_test.xml (deleted)
	* 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)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Merge branch 'ticket-866' of https://github.com/SasView/sasview into ...


Mon, 15 May 2017 14:19:32 GMT Gonzalez, Miguel <gonzalez@…> [a534432]
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Reorder if-block to clear plot when model returns only nans and show ...


Tue, 02 May 2017 12:06:36 GMT Paul Kienzle <pkienzle@…> [edba324]
	* 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)

	Merge branch 'master' into ticket-866


Tue, 02 May 2017 12:05:48 GMT Paul Kienzle <pkienzle@…> [914c49d5]
	* 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)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.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)

	Merge branch 'master' into batch_slicer


Mon, 01 May 2017 04:26:11 GMT andyfaff [a1b8fee]
	* 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/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/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/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)

	MAINT: from __future__ import print_function


Sun, 30 Apr 2017 22:15:17 GMT andyfaff [9c3d784]
	* 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/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/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.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/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)

	MAINT: using print function


Sun, 16 Apr 2017 18:27:35 GMT Paul Kienzle <pkienzle@…> [6e6dd4c]
	* .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/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)
	* setup.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* test/fileconverter/test/export2d.h5 (deleted)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.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/perspectives/fitting/basepage.py (modified)

	Merge branch 'master' into batch_slicer


Sun, 16 Apr 2017 18:08:15 GMT Paul Kienzle <pkienzle@…> [1cf4a130]
	* .gitattributes (modified)
	* .gitignore (modified)
	* Vagrantfile (modified)
	* Vagrantprovision.sh (modified)
	* check_packages.py (modified)
	* docs/pandoc-docs/Makefile (added)
	* docs/pandoc-docs/build_pandoc.py (added)
	* docs/pandoc-docs/source/README.txt (added)
	* 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/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)
	* run.py (modified)
	* sasview/custom_config.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/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/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/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/cansas_constants.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/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/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/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/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/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/config.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_processor.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/AnnulusSlicer.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/SlicerParameters.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/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/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/plugin_base.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/pyconsole.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/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.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.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/model_thread.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_state.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/canvas.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/plottables.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 (deleted)
	* 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)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	Merge branch 'master' into ticket-866


Fri, 14 Apr 2017 12:37:51 GMT Paul Kienzle <pkienzle@…> [72100ee]
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	typo in fitting/plugin.rst


Tue, 11 Apr 2017 08:26:08 GMT Adam Washington <adam.washington@…> [f1e409f]
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	Change "dir" to "directory" in _findModels

	The dir variable shadows the ...


Tue, 11 Apr 2017 08:24:45 GMT Adam Washington <adam.washington@…> [2a0d9ad]
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	Remove unnecessary parameter from _findModels

	The _findModels function ...


Tue, 11 Apr 2017 08:24:10 GMT Adam Washington <adam.washington@…> [8d891d1]
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	Align _findModels with pep8 style


Mon, 10 Apr 2017 16:42:23 GMT krzywon [6267876]
	* .gitattributes (modified)
	* check_packages.py (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/local_config.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/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/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/cansas_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/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/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/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/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/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/config.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_processor.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/AnnulusSlicer.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/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/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/plugin_base.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/pyconsole.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/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.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.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/model_thread.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_state.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/canvas.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/plottables.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)
	* 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/perspectives/fitting/basepage.py (modified)

	Merge branch 'master' into batch_slicer

	# Conflicts:
	#       ...


Mon, 10 Apr 2017 14:55:59 GMT gonzalezm [82373f5]
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Modifications suggested by Andrew Nelson.


Mon, 10 Apr 2017 09:14:32 GMT Tim Snow <tim.snow@…> [2d220dd]
	* 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)

	Merge branch 'master' into sld-calculator-mod


Mon, 10 Apr 2017 09:14:22 GMT Tim Snow <tim.snow@…> [fe09e9b]
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)

	Minor enhancement

	The text label next to the x-ray input box now ...


Mon, 10 Apr 2017 09:04:56 GMT Tim Snow <tim.snow@…> [bd8411d5]
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)

	Implementation finished

	Code the underpins the GUI created yesterday is ...


Mon, 10 Apr 2017 08:47:36 GMT krzywon [ac0578c]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Data sent to fitting properly.


Mon, 10 Apr 2017 08:12:45 GMT gonzalezm [5f768c2]
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Adding error message to fitting window when model does not return any ...


Sun, 09 Apr 2017 10:31:52 GMT Tim Snow <tim.snow@…> [8963a55]
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)

	GUI elements drawn

	Build the relevant GUI elements and started work on ...


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'


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 05:41:14 GMT GitHub <noreply@…> [861f1880]
	* 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)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)

	Merge pull request #64 from andyfaff/has_key

	MAINT: remove has_key ...


Fri, 07 Apr 2017 04:13:51 GMT andyfaff [c1d5aea]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)

	MAINT: use 'x is not None', instead of 'not x is None'.


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 09:55:21 GMT gonzalezm [80a49c2]
	* .gitignore (modified)
	* .travis.yml (modified)
	* build_tools/travis_build.sh (modified)
	* check_packages.py (modified)
	* mac_setup_homebrew.sh (added)
	* run.py (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (added)
	* sasview/sasview.py (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/calcthread.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/loader.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/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/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/dataloader/readers/xml_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/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.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_manager.py (modified)
	* src/sas/sasgui/guiframe/data_processor.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/images/dls_logo.png (added)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (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/data_operator.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/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/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.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/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/logging.ini (added)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/run_one.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sasdataloader/plugins/test_reader.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_abs_reader.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_data_handling.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/utest_sasview.py (modified)

	Merge branch 'master' of https://github.com/SasView/sasview


Tue, 04 Apr 2017 16:50:04 GMT Ricardo Ferraz Leal <ricleal@…> [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 <ricleal@…> [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


Tue, 04 Apr 2017 16:06:27 GMT Ricardo Ferraz Leal <ricleal@…> [c155a16]
	* .gitignore (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (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)

	Logging is now logger


Tue, 04 Apr 2017 16:00:18 GMT GitHub <noreply@…> [ed2276f]
	* check_packages.py (modified)
	* mac_setup_homebrew.sh (added)
	* setup.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.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/pagestate.py (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/sasdataloader/test/utest_abs_reader.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/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/dataFitting.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/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/model_thread.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/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_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)

	Merge branch 'master' into numpy_import


Sat, 01 Apr 2017 20:43:32 GMT gonzalezm [c5251f6]
	* .gitignore (modified)
	* INSTALL.txt (moved)
	* LICENSE.TXT (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* setup.py (modified)
	* src/sas/sascalc/calculator/slit_length_calculator.py (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/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.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/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.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/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' of https://github.com/SasView/sasview


Fri, 31 Mar 2017 09:20:15 GMT wojciech [5156918]
	* INSTALL.txt (moved)
	* LICENSE.TXT (modified)
	* sasview/README.txt (modified)
	* sasview/local_config.py (modified)
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* setup.py (modified)
	* src/sas/sascalc/calculator/slit_length_calculator.py (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/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.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/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.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/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' of https://github.com/SasView/sasview into ...


Thu, 30 Mar 2017 13:41:12 GMT GitHub <noreply@…> [4c5098c]
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Fixes #741 Remove P(Q), S(Q) feature


Mon, 27 Mar 2017 14:24:57 GMT krzywon [27109e5]
	* setup.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Setup includes all folders in the test data directory and pagestate ...


Mon, 27 Mar 2017 03:33:16 GMT andyfaff [9a5097c]
	* 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/dataFitting.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/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/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)

	MAINT: import numpy as np


Thu, 09 Mar 2017 15:59:25 GMT krzywon [b301db9]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Correct the calculation for dx_percent.


Thu, 09 Mar 2017 15:06:46 GMT Paul Kienzle <pkienzle@…> [984f3fc]
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	sasmodels doc: add note that parameter limits in the model truncate
	the ...


Wed, 08 Mar 2017 14:03:25 GMT krzywon [d5aff7f]
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Small code cleanup to only fetch dx_min from save state a single
	time.


Tue, 07 Mar 2017 20:47:21 GMT krzywon [096181d]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Coerce old custom pinhole smeared loaded from save states to ...


Tue, 07 Mar 2017 20:15:13 GMT krzywon [d85f1d8a]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Saving and then loading in same save state working with custom
	pinhole ...


Tue, 07 Mar 2017 16:50:13 GMT krzywon [7e98655]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Custom pinhole smearing accepts a constant %Q and applies it across ...


Thu, 02 Mar 2017 16:40:28 GMT krzywon [8c0d9eb]
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* 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/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.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/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Merge branch 'master' into ticket-844-part2


Thu, 02 Mar 2017 16:40:13 GMT krzywon [2d568f6]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Change which method is called to only update params, but not
	calculate ...


Thu, 02 Mar 2017 14:12:51 GMT krzywon [fdaf2b1]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Force a redraw of the model every time a new one is selected. #862


Wed, 01 Mar 2017 18:39:46 GMT krzywon [c1c9929]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Set smearer model before entering the smearing calculation. #844


Tue, 28 Feb 2017 16:33:01 GMT krzywon [27ba79c]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Simplify and fix _on_select_data method.


Mon, 27 Feb 2017 15:18:44 GMT krzywon [e64a03e]
	* setup.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Merge branch 'ticket-756' of https://github.com/SasView/sasview into ...


Mon, 27 Feb 2017 15:18:31 GMT krzywon [71601312]
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Put the category name change in the right place.


Mon, 27 Feb 2017 15:10:28 GMT krzywon [7a5aedd]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Move 'Custom Models' to 'Plugin Models' to name conversion.


Mon, 27 Feb 2017 14:58:22 GMT krzywon [be36447]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Set dxl & dxw values when sending data to fitting and small cleanup
	of ...


Mon, 27 Feb 2017 04:20:48 GMT butler [ddbac66]
	* src/sas/sasgui/guiframe/CategoryInstaller.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)

	Fix remaining custom/customized to plugin conversion


Mon, 27 Feb 2017 03:23:04 GMT butler [5295cf5]
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	update documentation for plugin vs customized (and a few spelling ...


Sat, 25 Feb 2017 20:33:43 GMT butler [ef2cdb3]
	* setup.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.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)

	Merge remote-tracking branch 'origin/master' into ticket-756


Wed, 22 Feb 2017 20:29:41 GMT krzywon [3d55219]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Check for slit smearing as well as pinhole, more pythonic truth
	checking ...


Tue, 21 Feb 2017 21:22:47 GMT krzywon [03137f1]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Default dQ is now None. dQ from data is selected automatically if dta ...


Tue, 21 Feb 2017 20:40:52 GMT krzywon [4387385]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Save states with 'Customized Models' category now load as 'Plugin ...


Sun, 19 Feb 2017 23:02:07 GMT butler [11b094f]
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Merge remote-tracking branch 'origin/master' into ticket-756


Tue, 14 Feb 2017 20:45:01 GMT Paul Kienzle <pkienzle@…> [1a8e13f0]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	remove unnecessary sleep


Tue, 07 Feb 2017 19:05:10 GMT GitHub <noreply@…> [2510b9b]
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* .gitignore (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/custom_config.py (modified)
	* sasview/local_config.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.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/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)

	Merge pull request #30 from SasView/ticket-827

	Fixes #795, #819, #827, ...


Tue, 07 Feb 2017 16:05:25 GMT krzywon [6d2b50b]
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Change the elif block to a dictionary search to minimize the number
	of ...


Mon, 06 Feb 2017 03:47:14 GMT butler [e92a352]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	replace "Customized Models" with Plugin Models in category lists. ...


Fri, 27 Jan 2017 20:58:23 GMT Steven C. Howell <steven.howell@…> [1221196]
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)

	fix transpose typo in year


Fri, 20 Jan 2017 08:33:50 GMT Gonzalez, Miguel <gonzalez@…> [51335d7]
	* .gitignore (modified)
	* .pydevproject (modified)
	* .travis.yml (modified)
	* LICENSE.TXT (added)
	* Vagrantfile (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/requirements.txt (modified)
	* check_packages.py (modified)
	* docs/pre-sphinx-docs/Graph_help_v0.html (deleted)
	* docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (deleted)
	* docs/pre-sphinx-docs/README-OLD-DOCS.TXT (deleted)
	* docs/pre-sphinx-docs/averaging_help_v0.html (deleted)
	* docs/pre-sphinx-docs/batch_help_v0.html (deleted)
	* docs/pre-sphinx-docs/category_manager_help_v0.html (deleted)
	* docs/pre-sphinx-docs/change_scale_help_v0.html (deleted)
	* docs/pre-sphinx-docs/data_explorer_help_v0.html (deleted)
	* docs/pre-sphinx-docs/data_operator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/density_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/fitting_help_v0.html (deleted)
	* docs/pre-sphinx-docs/fitting_key_help_v0.html (deleted)
	* docs/pre-sphinx-docs/glossaryhelp_v0.html (deleted)
	* docs/pre-sphinx-docs/graph_key_help_v0.html (deleted)
	* docs/pre-sphinx-docs/help_v0.html (deleted)
	* docs/pre-sphinx-docs/invariant_help_v0.html (deleted)
	* docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/load_data_help_v0.html (deleted)
	* docs/pre-sphinx-docs/load_image_help_v0.html (deleted)
	* docs/pre-sphinx-docs/model_documentation.docx (deleted)
	* docs/pre-sphinx-docs/model_editor_help_v0.html (deleted)
	* docs/pre-sphinx-docs/model_use_help_v0.html (deleted)
	* docs/pre-sphinx-docs/pd_help_v0.html (deleted)
	* docs/pre-sphinx-docs/polar_mag_help_v0.html (deleted)
	* docs/pre-sphinx-docs/pycrust_help_v0.html (deleted)
	* docs/pre-sphinx-docs/report_template_v0.html (deleted)
	* docs/pre-sphinx-docs/resolution_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (deleted)
	* docs/pre-sphinx-docs/single_fit_help_v0.html (deleted)
	* docs/pre-sphinx-docs/sld_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/slit_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/smear_computation_v0.html (deleted)
	* docs/pre-sphinx-docs/status_bar_help_v0.html (deleted)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/index.old (deleted)
	* docs/sphinx-docs/source/test/testdata_help.rst (deleted)
	* docs/sphinx-docs/source/user/README-ABOUT-TOCTREE-FILES.TXT (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/gpu_computations.rst (deleted)
	* docs/sphinx-docs/source/user/marketplace.rst (added)
	* docs/sphinx-docs/source/user/menu_bar.rst (added)
	* docs/sphinx-docs/source/user/opencl_installation.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/BatchGridClassLayout.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/M_angles_pic.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/data_explorer_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/guinier_fit.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/hand_menu.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_oper_pic.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_operator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_tutor.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/dm_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_debye_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_i.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_mag_pic.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_sas_help.html (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/image_viewer_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/load_image.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqx.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqy.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mxp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/myp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mzp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pdb_combo.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_convert.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_plot.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/python_shell_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/q.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_tutor.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sas_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sigma_q.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sigma_table.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld1.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld2.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/slit_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/v_j.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/M_angles_pic.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/ball.ico (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/batch_button_area.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/cat_fig0.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/cat_fig1.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/cat_fig2.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/dm_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/dream-complete.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/dream-incomplete.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/edit_menu.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/edit_model_menu.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/file_menu.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-amoeba.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-de.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-dream.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-lm.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-newton.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/m0x_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/m0y_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/m0z_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mqx.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mqy.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mxp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/myp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mzp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/new_model.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image001.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image002.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image003.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image004.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image005.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image006.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image007.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image008.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image009.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image010.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image011.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image012.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image013.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/plot_button.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/residuals_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/restore_batch_window.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sld1.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sld2.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image002.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image003.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image004.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image005.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image006.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image007.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image008.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image009.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image010.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image011.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image012.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image013.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image016.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image017.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image018.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image019.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image020.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image021.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image022.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image023.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image024.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image025.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image026.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image027.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image028.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sum_model.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_button.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_data_model.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/bookmark.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image001.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image002.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image003.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image004.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image005.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/redo.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/report.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/report_template.html (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/save.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/undo.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.rst (deleted)
	* 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)
	* run.py (modified)
	* sasview.latestversion (deleted)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/custom_config.py (modified)
	* sasview/default_categories.json (deleted)
	* sasview/images/ansto_logo.png (added)
	* sasview/images/ornl_logo.png (added)
	* sasview/images/tudelft_logo.png (added)
	* sasview/installer_generator.py (modified)
	* sasview/local_config.py (modified)
	* sasview/sasview.py (modified)
	* sasview/sasview.spec (added)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* sasview/test/1d_data/Anton-Paar.pdh (moved)
	* sasview/test/1d_data/ISIS_83404.TXT (moved)
	* sasview/test/1d_data/ISIS_98929.TXT (moved)
	* sasview/test/1d_data/rpa_igor.txt (added)
	* sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
	* sasview/test/README.txt (modified)
	* sasview/test/convertible_files/APS_X.TXT (moved)
	* sasview/test/convertible_files/APS_Y.TXT (moved)
	* sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* sasview/test/convertible_files/Z83000.I1D (moved)
	* sasview/test/convertible_files/Z83000.QAX (moved)
	* sasview/test/convertible_files/Z83001.I1D (moved)
	* sasview/test/convertible_files/Z83001.QAX (moved)
	* sasview/test/convertible_files/Z83002.I1D (moved)
	* sasview/test/convertible_files/Z98000.I1D (moved)
	* sasview/test/convertible_files/Z98000.QAX (moved)
	* sasview/test/convertible_files/Z98001.I1D (moved)
	* sasview/test/convertible_files/Z98001.QAX (moved)
	* sasview/test/convertible_files/Z98002.I1D (moved)
	* sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* sasview/test/coordinate_data/diamond.pdb (moved)
	* sasview/test/coordinate_data/dna.pdb (moved)
	* sasview/test/coordinate_data/sld_file.sld (moved)
	* sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* sasview/test/media/testdata_help.rst (modified)
	* sasview/test/other_files/dist _THETA_weights.txt (moved)
	* sasview/test/other_files/phi_weights.txt (moved)
	* sasview/test/other_files/radius_dist.txt (moved)
	* sasview/test/other_files/theta_weights.txt (moved)
	* sasview/test/save_states/constrained_fit_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (moved)
	* sasview/test/save_states/project_multiplicative_constraint.svs (added)
	* sasview/test/sesans_data/spheres2micron.ses (added)
	* sasview/version.txt (added)
	* setup.py (modified)
	* src/sas/sascalc/corfunc/__init__.py (added)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (added)
	* src/sas/sascalc/corfunc/transform_thread.py (added)
	* 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/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/__init__.py (added)
	* src/sas/sascalc/file_converter/bsl_loader.py (added)
	* src/sas/sascalc/file_converter/c_ext/__init__.py (added)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added)
	* src/sas/sascalc/file_converter/cansas_writer.py (added)
	* src/sas/sascalc/file_converter/nxcansas_writer.py (added)
	* src/sas/sascalc/file_converter/otoko_loader.py (added)
	* src/sas/sascalc/file_converter/red2d_writer.py (added)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (added)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (added)
	* src/sas/sasgui/guiframe/images/tudelft_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/plotting.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/panel_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_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/new_pycrust_example.png (added)
	* src/sas/sasgui/perspectives/calculator/media/new_pycrust_example_2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/old_pycrust_example.png (moved)
	* src/sas/sasgui/perspectives/calculator/media/pycrust_example.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/python_shell_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/__init__.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added)
	* src/sas/sasgui/perspectives/corfunc/media/Fibre_Diffraction_Review_1994_3_25-29.pdf (added)
	* src/sas/sasgui/perspectives/corfunc/media/Fibre_Diffraction_Review_2004_12_24.pdf (added)
	* src/sas/sasgui/perspectives/corfunc/media/Fibre_Diffraction_Review_2005_13_19-22.pdf (added)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/profile1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/profile2.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (added)
	* src/sas/sasgui/perspectives/file_converter/__init__.py (added)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (added)
	* src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (added)
	* src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added)
	* src/sas/sasgui/perspectives/file_converter/meta_panels.py (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/gpu_options.py (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_model_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_model_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/corfunc/test/98929.txt (added)
	* test/corfunc/test/utest_corfunc.py (added)
	* test/fileconverter/test/cansas1d.xml (added)
	* test/fileconverter/test/exp18_14_igor_2dqxqy.dat (added)
	* test/fileconverter/test/export2d.h5 (added)
	* test/fileconverter/test/utest_nxcansas_writer.py (added)
	* test/sasdataloader/test/utest_ascii.py (modified)

	Merge branch 'master' of https://github.com/SasView/sasview


Tue, 17 Jan 2017 12:21:59 GMT wojciech [ef0e644]
	* sasview/custom_config.py (modified)
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	Merged with master after fixes in sasmodels lib documention


Tue, 17 Jan 2017 12:20:37 GMT wojciech [ca6cbc1c]
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	Updated documentation for lib functions in sasmodels. Refers to
	ticket ...


Fri, 13 Jan 2017 17:23:48 GMT smk78 [1dc8ec9]
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)

	Provisioning for #784. Changed TRANSFORM_LABEL to TRANSFORM_LABEL1.
	In ...


Fri, 13 Jan 2017 15:52:21 GMT krzywon [18b7ca96]
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Merge branch 'ticket-795' into ticket-827


Fri, 13 Jan 2017 11:58:05 GMT Piotr Rozyczko <piotr.rozyczko@…> [73cbeec]
	* sasview/custom_config.py (modified)
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (added)

	Opencl dialog (#29)

	Merged OpenCL dialog prototype branch

	* Support ...


Thu, 12 Jan 2017 16:01:09 GMT krzywon [af08e55]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Saving and loading of 2D data within projects and fit save states is ...


Tue, 10 Jan 2017 18:52:45 GMT krzywon [ae9b8bf]
	* sasview/local_config.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)

	The corfunc perspective now saves and loads in files with the
	extension ...


Wed, 04 Jan 2017 11:28:20 GMT smk78 [27aabc1]
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)

	Changes to smearing help at ...


Tue, 03 Jan 2017 18:12:00 GMT krzywon [83c09af]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Fit states and projects are now able to save 2D data. Loading is
	still ...


Fri, 30 Dec 2016 16:33:07 GMT Doucet, Mathieu <doucetm@…> [c1681ea]
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Protect against incomplete models.


Thu, 29 Dec 2016 18:57:56 GMT mathieu [b0bebdc]
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Adapt SasViewModel to new multiplication model replacement. Fixes
	#209


Fri, 23 Dec 2016 15:16:52 GMT krzywon [12361fd]
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Trying to remove hidden characters in pagestate.


Fri, 23 Dec 2016 15:16:21 GMT krzywon [2d09bc2]
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Trying to remove hidden characters in pagestate.


Wed, 21 Dec 2016 16:59:49 GMT krzywon [fa487d93]
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Added versioning to pagestate and fit saves to ensure past changes
	are ...


Wed, 21 Dec 2016 15:48:31 GMT krzywon [a6fccd7]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.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)
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)

	Merge branch 'master' into ticket-795


Wed, 21 Dec 2016 15:48:26 GMT krzywon [9e0aa69a]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Added versioning to pagestate and fit saves for future use.


Wed, 21 Dec 2016 14:31:55 GMT GitHub <noreply@…> [bb3eb744]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Merge pull request #28 from SasView/ticket-811

	Ticket 811


Tue, 20 Dec 2016 20:03:50 GMT krzywon [24fd27a]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	#826: Smearing should now be applied to 1D data with dQ data present. ...


Tue, 20 Dec 2016 17:05:17 GMT krzywon [0de74af]
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Added a constant for "[plug-in]  " to maintain consistency across ...


Tue, 20 Dec 2016 12:59:08 GMT Paul Kienzle <pkienzle@…> [505706a]
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.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/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Merge branch 'master' into ticket-811


Tue, 20 Dec 2016 12:45:00 GMT Paul Kienzle <pkienzle@…> [d3911e3]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Reproduce sasview smear 2D wrapper so 2D fits work.  Fixes #811,
	#825.


Tue, 20 Dec 2016 00:51:49 GMT GitHub <noreply@…> [06a4306]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	Merge pull request #16 from SasView/ticket778

	Ticket778