#
# ChangeLog for src/sas/sascalc in sasview
#
# Generated by Trac 1.0.1
# Mar 13, 2025 4:00:22 PM

Wed, 27 Sep 2017 14:07:02 GMT celinedurniak <celine.durniak@…> [01cda57]
	* src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py (added)
	* src/sas/qtgui/Calculators/UI/ResolutionCalculatorPanelUI.ui (added)
	* src/sas/qtgui/Calculators/UnitTesting/ResolutionCalculatorPanelTest.py (added)
	* src/sas/qtgui/GUITests.py (modified)
	* src/sas/qtgui/MainWindow/GuiManager.py (modified)
	* src/sas/qtgui/Plotting/Plotter2D.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)

	Added new GUI for Q resolution estimator


Fri, 26 May 2017 11:41:44 GMT Piotr Rozyczko <rozyczko@…> [c416a17]
	* .gitattributes (modified)
	* .gitignore (modified)
	* .travis.yml (modified)
	* INSTALL.txt (moved)
	* LICENSE.TXT (modified)
	* Vagrantfile (modified)
	* Vagrantprovision.sh (modified)
	* build_tools/travis_build.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/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)
	* mac_setup_homebrew.sh (added)
	* run.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.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 (added)
	* 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/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/sphere_isis.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* 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_panel.py (modified)
	* src/examples/test_panel2D.py (modified)
	* src/examples/test_text_panel.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/instrument.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/calculator/slit_length_calculator.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/nxsunit.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/data_util/uncertainty.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/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/cansas_reader_HDF5.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/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/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/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/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/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/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/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/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_statusbar.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/gui_toolbar.py (modified)
	* src/sas/sasgui/guiframe/images/dls_logo.png (added)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.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/report_dialog.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.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/file_converter/file_converter.py (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/fitpage.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/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/__init__.py (moved)
	* test/calculatorview/test/__init__.py (moved)
	* test/calculatorview/test/utest_gui_sld.py (modified)
	* test/calculatorview/test/utest_sld.py (modified)
	* test/corfunc/__init__.py (moved)
	* test/corfunc/test/__init__.py (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/fileconverter/test/export2d.h5 (deleted)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/logging.ini (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/pr_inversion/test/utest_explorer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/run_one.py (modified)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/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/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasdataloader/test/error_conditions.py (modified)
	* 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/testLoad.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_red2d_reader.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/sasinvariant/test/utest_data_handling.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt (added)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md (added)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml (added)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh (added)
	* build_tools/Vagrant/Ubuntu1404/README.md (added)
	* build_tools/Vagrant/Ubuntu1404/Vagrantfile (added)
	* build_tools/Vagrant/Ubuntu1404/provision/bootstrap.sh (added)
	* build_tools/Vagrant/Ubuntu1404/provision/developer.sh (added)
	* build_tools/Vagrant/Ubuntu1404/provision/environment.yml (added)
	* build_tools/Vagrant/Ubuntu1404/provision/miniconda.sh (added)
	* sasview/test/image_data/ISIS_98940_greyscale.bmp (added)
	* sasview/test/image_data/ISIS_98940_greyscale.gif (added)
	* sasview/test/image_data/ISIS_98940_greyscale.jpg (added)
	* sasview/test/image_data/ISIS_98940_greyscale.png (added)
	* sasview/test/image_data/ISIS_98940_greyscale.tif (added)
	* src/sas/qtgui/Calculators/DensityPanel.py (added)
	* src/sas/qtgui/Calculators/GenericScatteringCalculator.py (added)
	* src/sas/qtgui/Calculators/KiessigPanel.py (added)
	* src/sas/qtgui/Calculators/SldPanel.py (added)
	* src/sas/qtgui/Calculators/SlitSizeCalculator.py (added)
	* src/sas/qtgui/Calculators/UI/DensityPanel.ui (added)
	* src/sas/qtgui/Calculators/UI/GenericScatteringCalculator.ui (added)
	* src/sas/qtgui/Calculators/UI/KiessigPanel.ui (added)
	* src/sas/qtgui/Calculators/UI/SldPanel.ui (added)
	* src/sas/qtgui/Calculators/UI/SlitSizeCalculator.ui (added)
	* src/sas/qtgui/Calculators/UI/__init__.py (added)
	* src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py (added)
	* src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py (added)
	* src/sas/qtgui/Calculators/UnitTesting/KiessigCalculatorTest.py (added)
	* src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py (added)
	* src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py (added)
	* src/sas/qtgui/Calculators/UnitTesting/__init__.py (added)
	* src/sas/qtgui/Calculators/__init__.py (added)
	* src/sas/qtgui/Dec07031.ASC (added)
	* src/sas/qtgui/GUITests.py (added)
	* src/sas/qtgui/MainWindow/AboutBox.py (added)
	* src/sas/qtgui/MainWindow/DataExplorer.py (added)
	* src/sas/qtgui/MainWindow/DataManager.py (added)
	* src/sas/qtgui/MainWindow/DataState.py (added)
	* src/sas/qtgui/MainWindow/DroppableDataLoadWidget.py (added)
	* src/sas/qtgui/MainWindow/GuiManager.py (added)
	* src/sas/qtgui/MainWindow/MainWindow.py (added)
	* src/sas/qtgui/MainWindow/UI/AboutUI.ui (added)
	* src/sas/qtgui/MainWindow/UI/AcknowledgementsUI.ui (added)
	* src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui (added)
	* src/sas/qtgui/MainWindow/UI/MainWindowUI.ui (added)
	* src/sas/qtgui/MainWindow/UI/TabbedFileLoadUI.ui (added)
	* src/sas/qtgui/MainWindow/UI/WelcomePanelUI.ui (added)
	* src/sas/qtgui/MainWindow/UI/__init__.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/AboutBoxTest.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/DroppableDataLoadWidgetTest.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/WelcomePanelTest.py (added)
	* src/sas/qtgui/MainWindow/UnitTesting/__init__.py (added)
	* src/sas/qtgui/MainWindow/WelcomePanel.py (added)
	* src/sas/qtgui/MainWindow/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FitPage.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FitThread.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (added)
	* src/sas/qtgui/Perspectives/Fitting/ModelThread.py (added)
	* src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py (added)
	* src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/OptionsWidgetUI.ui (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/SmearingWidgetUI.ui (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/convert_all.bat (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/convert_all.sh (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/convert_ui.sh (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FitPageTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py (added)
	* src/sas/qtgui/Perspectives/Fitting/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/model.png (added)
	* src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py (added)
	* src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (added)
	* src/sas/qtgui/Perspectives/Invariant/InvariantUtils.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.ui (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.ui (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/__init__.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/convert_all.bat (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/convert_all.sh (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/convert_ui.sh (added)
	* src/sas/qtgui/Perspectives/Invariant/__init__.py (added)
	* src/sas/qtgui/Perspectives/__init__.py (added)
	* src/sas/qtgui/Plotting/AddText.py (added)
	* src/sas/qtgui/Plotting/Arrow3D.py (added)
	* src/sas/qtgui/Plotting/Binder.py (added)
	* src/sas/qtgui/Plotting/BoxSum.py (added)
	* src/sas/qtgui/Plotting/ColorMap.py (added)
	* src/sas/qtgui/Plotting/ConvertUnits.py (added)
	* src/sas/qtgui/Plotting/DataTransform.py (added)
	* src/sas/qtgui/Plotting/Fittings.py (added)
	* src/sas/qtgui/Plotting/LineModel.py (added)
	* src/sas/qtgui/Plotting/LinearFit.py (added)
	* src/sas/qtgui/Plotting/MaskEditor.py (added)
	* src/sas/qtgui/Plotting/PlotHelper.py (added)
	* src/sas/qtgui/Plotting/PlotProperties.py (added)
	* src/sas/qtgui/Plotting/PlotUtilities.py (added)
	* src/sas/qtgui/Plotting/Plottables.py (added)
	* src/sas/qtgui/Plotting/Plotter.py (added)
	* src/sas/qtgui/Plotting/Plotter2D.py (added)
	* src/sas/qtgui/Plotting/PlotterBase.py (added)
	* src/sas/qtgui/Plotting/PlotterData.py (added)
	* src/sas/qtgui/Plotting/ScaleProperties.py (added)
	* src/sas/qtgui/Plotting/SetGraphRange.py (added)
	* src/sas/qtgui/Plotting/SlicerModel.py (added)
	* src/sas/qtgui/Plotting/SlicerParameters.py (added)
	* src/sas/qtgui/Plotting/Slicers/AnnulusSlicer.py (added)
	* src/sas/qtgui/Plotting/Slicers/Arc.py (added)
	* src/sas/qtgui/Plotting/Slicers/AzimutSlicer.py (added)
	* src/sas/qtgui/Plotting/Slicers/BaseInteractor.py (added)
	* src/sas/qtgui/Plotting/Slicers/BoxSlicer.py (added)
	* src/sas/qtgui/Plotting/Slicers/BoxSum.py (added)
	* src/sas/qtgui/Plotting/Slicers/SectorSlicer.py (added)
	* src/sas/qtgui/Plotting/Slicers/__init__.py (added)
	* src/sas/qtgui/Plotting/UI/AddTextUI.ui (added)
	* src/sas/qtgui/Plotting/UI/BoxSumUI.ui (added)
	* src/sas/qtgui/Plotting/UI/ColorMapUI.ui (added)
	* src/sas/qtgui/Plotting/UI/LinearFitUI.ui (added)
	* src/sas/qtgui/Plotting/UI/MaskEditorUI.ui (added)
	* src/sas/qtgui/Plotting/UI/PlotPropertiesUI.ui (added)
	* src/sas/qtgui/Plotting/UI/ScalePropertiesUI.ui (added)
	* src/sas/qtgui/Plotting/UI/SetGraphRangeUI.ui (added)
	* src/sas/qtgui/Plotting/UI/SlicerParametersUI.ui (added)
	* src/sas/qtgui/Plotting/UI/WindowTitleUI.ui (added)
	* src/sas/qtgui/Plotting/UI/__init__.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/AddTextTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/BoxSumTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/PlotHelperTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/PlotPropertiesTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/PlotUtilitiesTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/ScalePropertiesTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/SetGraphRangeTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/SlicerModelTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/SlicerParametersTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/WindowTitleTest.py (added)
	* src/sas/qtgui/Plotting/UnitTesting/__init__.py (added)
	* src/sas/qtgui/Plotting/WindowTitle.py (added)
	* src/sas/qtgui/Plotting/__init__.py (added)
	* src/sas/qtgui/Plotting/rangeSlider.py (added)
	* src/sas/qtgui/README.rst (added)
	* src/sas/qtgui/UI/__init__.py (added)
	* src/sas/qtgui/UI/convert.bat (added)
	* src/sas/qtgui/UI/convert_all.bat (added)
	* src/sas/qtgui/UI/convert_all.sh (added)
	* src/sas/qtgui/UI/convert_rc.bat (added)
	* src/sas/qtgui/UI/convert_rc.sh (added)
	* src/sas/qtgui/UI/convert_ui.sh (added)
	* src/sas/qtgui/UI/main_resources.qrc (added)
	* src/sas/qtgui/UI/res/SVwelcome.png (added)
	* src/sas/qtgui/UI/res/SendTo512.png (added)
	* src/sas/qtgui/UI/res/ball.ico (added)
	* src/sas/qtgui/UI/res/bookmark.png (added)
	* src/sas/qtgui/UI/res/copy.png (added)
	* src/sas/qtgui/UI/res/down-grey.png (added)
	* src/sas/qtgui/UI/res/file_send-128.png (added)
	* src/sas/qtgui/UI/res/house_2.png (added)
	* src/sas/qtgui/UI/res/paste.png (added)
	* src/sas/qtgui/UI/res/redo.png (added)
	* src/sas/qtgui/UI/res/report.png (added)
	* src/sas/qtgui/UI/res/reset.png (added)
	* src/sas/qtgui/UI/res/right-grey.png (added)
	* src/sas/qtgui/UI/res/save.png (added)
	* src/sas/qtgui/UI/res/undo.png (added)
	* src/sas/qtgui/UnitTesting/A_Raw_Example-1.omf (added)
	* src/sas/qtgui/UnitTesting/TestUtils.py (added)
	* src/sas/qtgui/UnitTesting/TestUtilsTest.py (added)
	* src/sas/qtgui/UnitTesting/__init__.py (added)
	* src/sas/qtgui/UnitTesting/diamdsml.pdb (added)
	* src/sas/qtgui/UnitTesting/sld_file.sld (added)
	* src/sas/qtgui/Utilities/CategoryInstaller.py (added)
	* src/sas/qtgui/Utilities/ConnectionProxy.py (added)
	* src/sas/qtgui/Utilities/CustomDir.py (added)
	* src/sas/qtgui/Utilities/GenericReader.py (added)
	* src/sas/qtgui/Utilities/GuiUtils.py (added)
	* src/sas/qtgui/Utilities/IPythonWidget.py (added)
	* src/sas/qtgui/Utilities/LocalConfig.py (added)
	* src/sas/qtgui/Utilities/ObjectLibrary.py (added)
	* src/sas/qtgui/Utilities/SasviewLogger.py (added)
	* src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py (added)
	* src/sas/qtgui/Utilities/UnitTesting/SasviewLoggerTest.py (added)
	* src/sas/qtgui/Utilities/UnitTesting/__init__.py (added)
	* src/sas/qtgui/Utilities/__init__.py (added)
	* src/sas/qtgui/__init__.py (added)
	* src/sas/qtgui/convertUI.py (added)
	* src/sas/qtgui/cyl_400_20.txt (added)
	* src/sas/qtgui/empty_file.txt (added)
	* src/sas/qtgui/images/SVwelcome.png (added)
	* src/sas/qtgui/images/SVwelcome_mini.png (added)
	* src/sas/qtgui/images/angles.png (added)
	* src/sas/qtgui/images/angles_flat.png (added)
	* src/sas/qtgui/images/ansto_logo.png (added)
	* src/sas/qtgui/images/ball.icns (added)
	* src/sas/qtgui/images/ball.ico (added)
	* src/sas/qtgui/images/convert_rc.bat (added)
	* src/sas/qtgui/images/convert_rc.sh (added)
	* src/sas/qtgui/images/danse_logo.png (added)
	* src/sas/qtgui/images/ess_logo.png (added)
	* src/sas/qtgui/images/icons/Thumbs.db (added)
	* src/sas/qtgui/images/icons/angles.png (added)
	* src/sas/qtgui/images/icons/angles_flat.png (added)
	* src/sas/qtgui/images/icons/ansto_logo.png (added)
	* src/sas/qtgui/images/icons/ball.icns (added)
	* src/sas/qtgui/images/icons/ball.ico (added)
	* src/sas/qtgui/images/icons/bookmark.png (added)
	* src/sas/qtgui/images/icons/copy.png (added)
	* src/sas/qtgui/images/icons/danse_logo.png (added)
	* src/sas/qtgui/images/icons/drag_arrow.png (added)
	* src/sas/qtgui/images/icons/drag_hand.png (added)
	* src/sas/qtgui/images/icons/ess_logo.png (added)
	* src/sas/qtgui/images/icons/favorites.png (added)
	* src/sas/qtgui/images/icons/hide.png (added)
	* src/sas/qtgui/images/icons/house_2.png (added)
	* src/sas/qtgui/images/icons/ill_logo.png (added)
	* src/sas/qtgui/images/icons/isis_logo.png (added)
	* src/sas/qtgui/images/icons/nist_logo.png (added)
	* src/sas/qtgui/images/icons/nsf_logo.png (added)
	* src/sas/qtgui/images/icons/paste.png (added)
	* src/sas/qtgui/images/icons/preview.png (added)
	* src/sas/qtgui/images/icons/printer.png (added)
	* src/sas/qtgui/images/icons/redo.png (added)
	* src/sas/qtgui/images/icons/report.png (added)
	* src/sas/qtgui/images/icons/reset.png (added)
	* src/sas/qtgui/images/icons/save.png (added)
	* src/sas/qtgui/images/icons/search.png (added)
	* src/sas/qtgui/images/icons/search_pan.png (added)
	* src/sas/qtgui/images/icons/sns_logo.png (added)
	* src/sas/qtgui/images/icons/star_plus.png (added)
	* src/sas/qtgui/images/icons/umd_logo.png (added)
	* src/sas/qtgui/images/icons/undo.png (added)
	* src/sas/qtgui/images/icons/utlogo.gif (added)
	* src/sas/qtgui/images/icons/zoom_in.png (added)
	* src/sas/qtgui/images/icons/zoom_out.png (added)
	* src/sas/qtgui/images/ill_logo.png (added)
	* src/sas/qtgui/images/images.qrc (added)
	* src/sas/qtgui/images/isis_logo.png (added)
	* src/sas/qtgui/images/nist_logo.png (added)
	* src/sas/qtgui/images/nsf_logo.png (added)
	* src/sas/qtgui/images/sns_logo.png (added)
	* src/sas/qtgui/images/umd_logo.png (added)
	* src/sas/qtgui/images/utlogo.gif (added)
	* src/sas/qtgui/make_ui.bat (added)
	* src/sas/qtgui/make_ui.sh (added)
	* src/sas/qtgui/path_prepare.py (added)
	* src/sas/qtgui/run_tests.bat (added)
	* src/sas/qtgui/run_tests.sh (added)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)

	Merge branch 'master' into ESS_GUI


Thu, 18 May 2017 19:16:57 GMT GitHub <noreply@…> [7132e49]
	* run.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* test/calculatorview/__init__.py (added)
	* test/calculatorview/test/__init__.py (added)
	* test/corfunc/__init__.py (added)
	* test/corfunc/test/__init__.py (added)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/sasdataloader/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasguiframe/__init__.py (added)
	* test/sasguiframe/test/__init__.py (added)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/__init__.py (added)
	* test/sasinvariant/test/__init__.py (added)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)
	* sasview/test/sesans_data/sphere2micron.ses (modified)
	* sasview/test/sesans_data/sphere_isis.ses (added)
	* src/sas/sascalc/data_util/nxsunit.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* test/sasdataloader/test/sesans_examples/next_gen.ses (added)
	* test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added)
	* test/sasdataloader/test/sesans_examples/no_wavelength.ses (added)
	* test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere2micron.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere_isis.ses (added)
	* test/sasdataloader/test/sesans_examples/too_many_headers.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)

	Merge pull request #77 from SasView/log_binning

	Closes #920


Thu, 18 May 2017 18:48:06 GMT Ricardo M. Ferraz Leal <ricleal@…> [46cd1c3]
	* src/sas/sascalc/dataloader/manipulations.py (modified)

	Added Design by contract


Tue, 16 May 2017 12:16:20 GMT GitHub <noreply@…> [2f17d40]
	* sasview/test/sesans_data/sphere2micron.ses (modified)
	* sasview/test/sesans_data/sphere_isis.ses (added)
	* src/sas/sascalc/data_util/nxsunit.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/next_gen.ses (added)
	* test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added)
	* test/sasdataloader/test/sesans_examples/no_wavelength.ses (added)
	* test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere2micron.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere_isis.ses (added)
	* test/sasdataloader/test/sesans_examples/too_many_headers.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)
	* .gitignore (modified)
	* Vagrantfile (modified)
	* Vagrantprovision.sh (modified)
	* docs/sasview/Tutorial.pdf (modified)
	* docs/sasview/Tutorial.pptx (modified)
	* docs/sasview/Tutorial_SV2.pdf (moved)
	* docs/sasview/Tutorial_SV2.pptx (moved)
	* docs/sasview/Tutorial_SV3.pdf (added)
	* docs/sasview/Tutorial_SV3.pptx (added)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* run.py (modified)
	* sasview/installer_generator.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logger_config.py (added)
	* sasview/logging.ini (modified)
	* sasview/media/README.txt (modified)
	* sasview/media/Tutorial.pdf (modified)
	* sasview/media/getting_started_with_sasview.pdf (added)
	* sasview/sasview.py (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/nr_data/NR_Ni_down_state.txt (added)
	* sasview/test/nr_data/NR_Ni_up_state.txt (added)
	* sasview/wxcruft.py (modified)
	* setup.py (modified)
	* src/examples/data_generator/testdata_generator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/formatnum.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified)
	* src/sas/sascalc/simulation/iqPy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/dummyapp.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/perspectives/calculator/detector_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/convert_units.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* test/fileconverter/test/export2d.h5 (deleted)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/run_one.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (deleted)
	* test/sasdataloader/test/isis_1_1_write_test.xml (deleted)
	* test/sasdataloader/test/sequence_tests.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (deleted)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)

	Merge pull request #76 from rprospero/master

	Update SESANS reader to ...


Tue, 16 May 2017 11:48:56 GMT Adam Washington <adam.washington@…> [8e9536f]
	* src/sas/sascalc/data_util/nxsunit.py (modified)

	Add inverse meter units to nxsunit


Tue, 02 May 2017 12:07:40 GMT Paul Kienzle <pkienzle@…> [5e903e8b]
	* sasview/installer_generator.py (modified)
	* sasview/local_config.py (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/wxcruft.py (modified)
	* src/examples/data_generator/testdata_generator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/formatnum.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified)
	* src/sas/sascalc/simulation/iqPy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/dummyapp.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/perspectives/calculator/detector_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/convert_units.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/run_one.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (deleted)
	* test/sasdataloader/test/isis_1_1_write_test.xml (deleted)
	* test/sasdataloader/test/sequence_tests.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (deleted)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)
	* run.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* test/calculatorview/__init__.py (added)
	* test/calculatorview/test/__init__.py (added)
	* test/corfunc/__init__.py (added)
	* test/corfunc/test/__init__.py (added)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/sasdataloader/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasguiframe/__init__.py (added)
	* test/sasguiframe/test/__init__.py (added)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/__init__.py (added)
	* test/sasinvariant/test/__init__.py (added)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)

	Merge branch 'master' into log_binning


Mon, 01 May 2017 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 17:24:07 GMT Paul Kienzle <pkienzle@…> [b290a9e]
	* src/sas/sascalc/dataloader/manipulations.py (modified)

	fix bad indent after merge


Sun, 16 Apr 2017 17:01:30 GMT Paul Kienzle <pkienzle@…> [6c497b7]
	* .gitignore (modified)
	* Vagrantfile (modified)
	* Vagrantprovision.sh (modified)
	* check_packages.py (modified)
	* docs/sasview/Tutorial.pdf (modified)
	* docs/sasview/Tutorial.pptx (modified)
	* docs/sasview/Tutorial_SV2.pdf (moved)
	* docs/sasview/Tutorial_SV2.pptx (moved)
	* docs/sasview/Tutorial_SV3.pdf (added)
	* docs/sasview/Tutorial_SV3.pptx (added)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* run.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logger_config.py (added)
	* sasview/logging.ini (modified)
	* sasview/media/README.txt (modified)
	* sasview/media/Tutorial.pdf (modified)
	* sasview/media/getting_started_with_sasview.pdf (added)
	* sasview/sasview.py (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/nr_data/NR_Ni_down_state.txt (added)
	* sasview/test/nr_data/NR_Ni_up_state.txt (added)
	* sasview/welcome_panel.py (modified)
	* setup.py (modified)
	* src/sas/sascalc/calculator/kiessig_calculator.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/fileconverter/test/export2d.h5 (deleted)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/calculatorview/__init__.py (added)
	* test/calculatorview/test/__init__.py (added)
	* test/corfunc/__init__.py (added)
	* test/corfunc/test/__init__.py (added)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/sasdataloader/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasguiframe/__init__.py (added)
	* test/sasguiframe/test/__init__.py (added)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/__init__.py (added)
	* test/sasinvariant/test/__init__.py (added)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)

	Merge branch 'master' into log_binning


Mon, 10 Apr 2017 15:03:10 GMT Adam Washington <adam.washington@…> [149b8f6]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Better pep8 in sesans_reader


Mon, 10 Apr 2017 15:01:14 GMT Adam Washington <adam.washington@…> [8938502]
	* check_packages.py (modified)
	* sasview/local_config.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* src/sas/sascalc/calculator/kiessig_calculator.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* sasview/test/sesans_data/sphere2micron.ses (modified)
	* sasview/test/sesans_data/sphere_isis.ses (added)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/next_gen.ses (added)
	* test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added)
	* test/sasdataloader/test/sesans_examples/no_wavelength.ses (added)
	* test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere2micron.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere_isis.ses (added)
	* test/sasdataloader/test/sesans_examples/too_many_headers.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)

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


Mon, 10 Apr 2017 08:01:46 GMT Piotr Rozyczko <rozyczko@…> [9687d58]
	* .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/marketplace.rst (added)
	* docs/sphinx-docs/source/user/menu_bar.rst (added)
	* 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 (added)
	* sasview/test/image_data/ISIS_98940_greyscale_gif.gif (added)
	* sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (added)
	* sasview/test/image_data/ISIS_98940_greyscale_png.png (added)
	* sasview/test/image_data/ISIS_98940_greyscale_tif.tif (added)
	* 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/media/pr_help.rst (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)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt (added)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md (added)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml (added)
	* build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh (added)
	* build_tools/Vagrant/Ubuntu1404/README.md (added)
	* build_tools/Vagrant/Ubuntu1404/Vagrantfile (added)
	* build_tools/Vagrant/Ubuntu1404/provision/bootstrap.sh (added)
	* build_tools/Vagrant/Ubuntu1404/provision/developer.sh (added)
	* build_tools/Vagrant/Ubuntu1404/provision/environment.yml (added)
	* build_tools/Vagrant/Ubuntu1404/provision/miniconda.sh (added)
	* sasview/test/image_data/ISIS_98940_greyscale.bmp (added)
	* sasview/test/image_data/ISIS_98940_greyscale.gif (added)
	* sasview/test/image_data/ISIS_98940_greyscale.jpg (added)
	* sasview/test/image_data/ISIS_98940_greyscale.png (added)
	* sasview/test/image_data/ISIS_98940_greyscale.tif (added)
	* src/sas/qtgui/AboutBox.py (added)
	* src/sas/qtgui/AddText.py (added)
	* src/sas/qtgui/BoxSum.py (added)
	* src/sas/qtgui/ColorMap.py (added)
	* src/sas/qtgui/DataExplorer.py (added)
	* src/sas/qtgui/Dec07031.ASC (added)
	* src/sas/qtgui/DensityPanel.py (added)
	* src/sas/qtgui/DroppableDataLoadWidget.py (added)
	* src/sas/qtgui/GUITests.py (added)
	* src/sas/qtgui/GuiManager.py (added)
	* src/sas/qtgui/GuiUtils.py (added)
	* src/sas/qtgui/IPythonWidget.py (added)
	* src/sas/qtgui/KiessigPanel.py (added)
	* src/sas/qtgui/LinearFit.py (added)
	* src/sas/qtgui/LocalConfig.py (added)
	* src/sas/qtgui/MainWindow.py (added)
	* src/sas/qtgui/MaskEditor.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (added)
	* src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/convert_all.bat (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/convert_all.sh (added)
	* src/sas/qtgui/Perspectives/Fitting/UI/convert_ui.sh (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (added)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/__init__.py (added)
	* src/sas/qtgui/Perspectives/Fitting/model.png (added)
	* src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py (added)
	* src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (added)
	* src/sas/qtgui/Perspectives/Invariant/InvariantUtils.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.ui (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.ui (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/__init__.py (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/convert_all.bat (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/convert_all.sh (added)
	* src/sas/qtgui/Perspectives/Invariant/UI/convert_ui.sh (added)
	* src/sas/qtgui/Perspectives/Invariant/__init__.py (added)
	* src/sas/qtgui/Perspectives/__init__.py (added)
	* src/sas/qtgui/PlotHelper.py (added)
	* src/sas/qtgui/PlotProperties.py (added)
	* src/sas/qtgui/PlotUtilities.py (added)
	* src/sas/qtgui/Plotter.py (added)
	* src/sas/qtgui/Plotter2D.py (added)
	* src/sas/qtgui/PlotterBase.py (added)
	* src/sas/qtgui/README.rst (added)
	* src/sas/qtgui/SasviewLogger.py (added)
	* src/sas/qtgui/ScaleProperties.py (added)
	* src/sas/qtgui/SetGraphRange.py (added)
	* src/sas/qtgui/SldPanel.py (added)
	* src/sas/qtgui/SlicerModel.py (added)
	* src/sas/qtgui/SlicerParameters.py (added)
	* src/sas/qtgui/SlitSizeCalculator.py (added)
	* src/sas/qtgui/UI/AboutUI.ui (added)
	* src/sas/qtgui/UI/AcknowledgementsUI.ui (added)
	* src/sas/qtgui/UI/AddTextUI.ui (added)
	* src/sas/qtgui/UI/BoxSumUI.ui (added)
	* src/sas/qtgui/UI/ColorMapUI.ui (added)
	* src/sas/qtgui/UI/DataExplorerUI.ui (added)
	* src/sas/qtgui/UI/DensityPanel.ui (added)
	* src/sas/qtgui/UI/FitPanel.ui (added)
	* src/sas/qtgui/UI/KiessigPanel.ui (added)
	* src/sas/qtgui/UI/LinearFitUI.ui (added)
	* src/sas/qtgui/UI/MainWindowUI.ui (added)
	* src/sas/qtgui/UI/MaskEditorUI.ui (added)
	* src/sas/qtgui/UI/PlotPropertiesUI.ui (added)
	* src/sas/qtgui/UI/PrPanel.ui (added)
	* src/sas/qtgui/UI/ScalePropertiesUI.ui (added)
	* src/sas/qtgui/UI/SetGraphRangeUI.ui (added)
	* src/sas/qtgui/UI/SldPanel.ui (added)
	* src/sas/qtgui/UI/SlicerParametersUI.ui (added)
	* src/sas/qtgui/UI/SlitSizeCalculator.ui (added)
	* src/sas/qtgui/UI/TabbedFileLoadUI.ui (added)
	* src/sas/qtgui/UI/WelcomePanelUI.ui (added)
	* src/sas/qtgui/UI/WindowTitleUI.ui (added)
	* src/sas/qtgui/UI/__init__.py (added)
	* src/sas/qtgui/UI/convert.bat (added)
	* src/sas/qtgui/UI/convert_all.bat (added)
	* src/sas/qtgui/UI/convert_all.sh (added)
	* src/sas/qtgui/UI/convert_rc.bat (added)
	* src/sas/qtgui/UI/convert_rc.sh (added)
	* src/sas/qtgui/UI/convert_ui.sh (added)
	* src/sas/qtgui/UI/main_resources.qrc (added)
	* src/sas/qtgui/UI/res/SVwelcome.png (added)
	* src/sas/qtgui/UI/res/SendTo512.png (added)
	* src/sas/qtgui/UI/res/ball.ico (added)
	* src/sas/qtgui/UI/res/bookmark.png (added)
	* src/sas/qtgui/UI/res/copy.png (added)
	* src/sas/qtgui/UI/res/down-grey.png (added)
	* src/sas/qtgui/UI/res/file_send-128.png (added)
	* src/sas/qtgui/UI/res/house_2.png (added)
	* src/sas/qtgui/UI/res/paste.png (added)
	* src/sas/qtgui/UI/res/redo.png (added)
	* src/sas/qtgui/UI/res/report.png (added)
	* src/sas/qtgui/UI/res/reset.png (added)
	* src/sas/qtgui/UI/res/right-grey.png (added)
	* src/sas/qtgui/UI/res/save.png (added)
	* src/sas/qtgui/UI/res/undo.png (added)
	* src/sas/qtgui/UnitTesting/AboutBoxTest.py (added)
	* src/sas/qtgui/UnitTesting/AddTextTest.py (added)
	* src/sas/qtgui/UnitTesting/BoxSumTest.py (added)
	* src/sas/qtgui/UnitTesting/ColorMapTest.py (added)
	* src/sas/qtgui/UnitTesting/DataExplorerTest.py (added)
	* src/sas/qtgui/UnitTesting/DensityCalculatorTest.py (added)
	* src/sas/qtgui/UnitTesting/DroppableDataLoadWidgetTest.py (added)
	* src/sas/qtgui/UnitTesting/GuiManagerTest.py (added)
	* src/sas/qtgui/UnitTesting/GuiUtilsTest.py (added)
	* src/sas/qtgui/UnitTesting/InvariantDetailsTest.py (added)
	* src/sas/qtgui/UnitTesting/InvariantTest.py (added)
	* src/sas/qtgui/UnitTesting/InvariantUtilsTest.py (added)
	* src/sas/qtgui/UnitTesting/KiessigCalculatorTest.py (added)
	* src/sas/qtgui/UnitTesting/LinearFitTest.py (added)
	* src/sas/qtgui/UnitTesting/MainWindowTest.py (added)
	* src/sas/qtgui/UnitTesting/PlotHelperTest.py (added)
	* src/sas/qtgui/UnitTesting/PlotPropertiesTest.py (added)
	* src/sas/qtgui/UnitTesting/PlotUtilitiesTest.py (added)
	* src/sas/qtgui/UnitTesting/Plotter2DTest.py (added)
	* src/sas/qtgui/UnitTesting/PlotterBaseTest.py (added)
	* src/sas/qtgui/UnitTesting/PlotterTest.py (added)
	* src/sas/qtgui/UnitTesting/SLDCalculatorTest.py (added)
	* src/sas/qtgui/UnitTesting/SasviewLoggerTest.py (added)
	* src/sas/qtgui/UnitTesting/ScalePropertiesTest.py (added)
	* src/sas/qtgui/UnitTesting/SetGraphRangeTest.py (added)
	* src/sas/qtgui/UnitTesting/SlicerModelTest.py (added)
	* src/sas/qtgui/UnitTesting/SlicerParametersTest.py (added)
	* src/sas/qtgui/UnitTesting/SlitSizeCalculatorTest.py (added)
	* src/sas/qtgui/UnitTesting/TestUtils.py (added)
	* src/sas/qtgui/UnitTesting/TestUtilsTest.py (added)
	* src/sas/qtgui/UnitTesting/WelcomePanelTest.py (added)
	* src/sas/qtgui/UnitTesting/WindowTitleTest.py (added)
	* src/sas/qtgui/UnitTesting/__init__.py (added)
	* src/sas/qtgui/WelcomePanel.py (added)
	* src/sas/qtgui/WindowTitle.py (added)
	* src/sas/qtgui/__init__.py (added)
	* src/sas/qtgui/beam_profile.DAT (added)
	* src/sas/qtgui/cyl_400_20.txt (added)
	* src/sas/qtgui/empty_file.txt (added)
	* src/sas/qtgui/images/SVwelcome.png (added)
	* src/sas/qtgui/images/SVwelcome_mini.png (added)
	* src/sas/qtgui/images/angles.png (added)
	* src/sas/qtgui/images/angles_flat.png (added)
	* src/sas/qtgui/images/ansto_logo.png (added)
	* src/sas/qtgui/images/ball.icns (added)
	* src/sas/qtgui/images/ball.ico (added)
	* src/sas/qtgui/images/convert_rc.bat (added)
	* src/sas/qtgui/images/convert_rc.sh (added)
	* src/sas/qtgui/images/danse_logo.png (added)
	* src/sas/qtgui/images/ess_logo.png (added)
	* src/sas/qtgui/images/icons/Thumbs.db (added)
	* src/sas/qtgui/images/icons/angles.png (added)
	* src/sas/qtgui/images/icons/angles_flat.png (added)
	* src/sas/qtgui/images/icons/ansto_logo.png (added)
	* src/sas/qtgui/images/icons/ball.icns (added)
	* src/sas/qtgui/images/icons/ball.ico (added)
	* src/sas/qtgui/images/icons/bookmark.png (added)
	* src/sas/qtgui/images/icons/copy.png (added)
	* src/sas/qtgui/images/icons/danse_logo.png (added)
	* src/sas/qtgui/images/icons/drag_arrow.png (added)
	* src/sas/qtgui/images/icons/drag_hand.png (added)
	* src/sas/qtgui/images/icons/ess_logo.png (added)
	* src/sas/qtgui/images/icons/favorites.png (added)
	* src/sas/qtgui/images/icons/hide.png (added)
	* src/sas/qtgui/images/icons/house_2.png (added)
	* src/sas/qtgui/images/icons/ill_logo.png (added)
	* src/sas/qtgui/images/icons/isis_logo.png (added)
	* src/sas/qtgui/images/icons/nist_logo.png (added)
	* src/sas/qtgui/images/icons/nsf_logo.png (added)
	* src/sas/qtgui/images/icons/paste.png (added)
	* src/sas/qtgui/images/icons/preview.png (added)
	* src/sas/qtgui/images/icons/printer.png (added)
	* src/sas/qtgui/images/icons/redo.png (added)
	* src/sas/qtgui/images/icons/report.png (added)
	* src/sas/qtgui/images/icons/reset.png (added)
	* src/sas/qtgui/images/icons/save.png (added)
	* src/sas/qtgui/images/icons/search.png (added)
	* src/sas/qtgui/images/icons/search_pan.png (added)
	* src/sas/qtgui/images/icons/sns_logo.png (added)
	* src/sas/qtgui/images/icons/star_plus.png (added)
	* src/sas/qtgui/images/icons/umd_logo.png (added)
	* src/sas/qtgui/images/icons/undo.png (added)
	* src/sas/qtgui/images/icons/utlogo.gif (added)
	* src/sas/qtgui/images/icons/zoom_in.png (added)
	* src/sas/qtgui/images/icons/zoom_out.png (added)
	* src/sas/qtgui/images/ill_logo.png (added)
	* src/sas/qtgui/images/images.qrc (added)
	* src/sas/qtgui/images/isis_logo.png (added)
	* src/sas/qtgui/images/nist_logo.png (added)
	* src/sas/qtgui/images/nsf_logo.png (added)
	* src/sas/qtgui/images/sns_logo.png (added)
	* src/sas/qtgui/images/umd_logo.png (added)
	* src/sas/qtgui/images/utlogo.gif (added)
	* src/sas/qtgui/make_ui.bat (added)
	* src/sas/qtgui/make_ui.sh (added)
	* src/sas/qtgui/path_prepare.py (added)
	* src/sas/qtgui/rangeSlider.py (added)
	* src/sas/qtgui/run_tests.bat (added)
	* src/sas/qtgui/run_tests.sh (added)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.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/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)

	Merge branch 'master' into ESS_GUI


Sun, 09 Apr 2017 10:30:10 GMT andyfaff [45dffa69]
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)

	MAINT: more 'not x is None' fixes


Sun, 09 Apr 2017 10:11:31 GMT andyfaff [7432acb]
	* sasview/welcome_panel.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)

	MAINT: search+replace '!= None' by 'is not None'


Sun, 09 Apr 2017 10:08:43 GMT andyfaff [ac07a3a]
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)

	MAINT: replace 'not x is None' by 'x is not None'


Sun, 09 Apr 2017 09:46:10 GMT andyfaff [235f514]
	* check_packages.py (modified)
	* sasview/setup_mac.py (modified)
	* src/sas/sascalc/calculator/kiessig_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)

	MAINT: replace '== None' by 'is None'


Sun, 09 Apr 2017 09:38:26 GMT Adam Washington <adam.washington@…> [e962d85]
	* src/sas/sascalc/data_util/qsmearing.py (modified)

	Pass flake8 and pylint for changes in qsmearing


Sun, 09 Apr 2017 09:35:47 GMT Adam Washington <adam.washington@…> [f6c2555]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Pass flake8 and pylint in sesans_reader.py


Sun, 09 Apr 2017 09:33:25 GMT Adam Washington <adam.washington@…> [1550ee0]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Remove inaccurate comment


Sun, 09 Apr 2017 09:31:32 GMT Adam Washington <adam.washington@…> [35cf5c0]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/too_many_headers.ses (added)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Test that SASView complains if SES columns do not match headers


Sun, 09 Apr 2017 09:24:21 GMT Adam Washington <adam.washington@…> [e801a4e]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/no_wavelength.ses (added)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Test that SESANS files insist on proper headers


Sun, 09 Apr 2017 09:13:18 GMT Adam Washington <adam.washington@…> [a81af92]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/next_gen.ses (added)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Reject time travelling SESANS files


Sun, 09 Apr 2017 09:09:13 GMT Adam Washington <adam.washington@…> [f344f6c]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Throw exception if SES file has not version data


Sun, 09 Apr 2017 09:08:48 GMT Adam Washington <adam.washington@…> [5ae40e7]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Throw an exception if sesans file has conflicting units

	We've decided ...


Sun, 09 Apr 2017 09:00:29 GMT Adam Washington <adam.washington@…> [10ab40e]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Throw an exception if sesans file is missing necessary units


Sun, 09 Apr 2017 08:03:36 GMT Adam Washington <adam.washington@…> [4d465e3]
	* .gitattributes (modified)
	* docs/pandoc-docs/Makefile (added)
	* docs/pandoc-docs/build_pandoc.py (added)
	* docs/pandoc-docs/source/README.txt (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/marketplace.rst (modified)
	* docs/sphinx-docs/source/user/menu_bar.rst (modified)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/custom_config.py (modified)
	* sasview/installer_generator.py (modified)
	* sasview/media/README.txt (modified)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* setup.py (modified)
	* src/examples/data_generator/test_transfo.py (modified)
	* src/examples/data_generator/testdata_generator.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_text_panel.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/invariant/invariant_mapper.py (modified)
	* src/sas/sascalc/pr/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/distance_explorer.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/custom_pstats.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/data_state.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/dummyapp.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/gui_toolbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/pdfview.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified)
	* src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/console.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/detector_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/load_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sample_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/console.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/resultpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/__init__.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_widgets.py (modified)
	* src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified)
	* src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified)
	* src/sas/sasgui/perspectives/simulation/__init__.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/BaseInteractor.py (modified)
	* src/sas/sasgui/plottools/LabelDialog.py (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/PropertyDialog.py (modified)
	* src/sas/sasgui/plottools/SizeDialog.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/convert_units.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/README.rst (modified)
	* test/calculatorview/test/utest_gui_sld.py (modified)
	* test/calculatorview/test/utest_sld.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/pr_inversion/test/utest_explorer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_resolution_calculator.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/error_conditions.py (modified)
	* test/sasdataloader/test/sequence_tests.py (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)
	* sasview/test/sesans_data/sphere2micron.ses (modified)
	* sasview/test/sesans_data/sphere_isis.ses (added)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sesans_examples/sphere2micron.ses (added)
	* test/sasdataloader/test/sesans_examples/sphere_isis.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)

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


Sat, 08 Apr 2017 12:47:39 GMT Ricardo Ferraz Leal <ricleal@…> [c0ca2e3d]
	* .gitattributes (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/marketplace.rst (modified)
	* docs/sphinx-docs/source/user/menu_bar.rst (modified)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/custom_config.py (modified)
	* sasview/installer_generator.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* setup.py (modified)
	* src/examples/data_generator/test_transfo.py (modified)
	* src/examples/data_generator/testdata_generator.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_text_panel.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/invariant/invariant_mapper.py (modified)
	* src/sas/sascalc/pr/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/distance_explorer.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/custom_pstats.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/data_state.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/dummyapp.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/gui_toolbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/pdfview.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified)
	* src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/console.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/detector_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/load_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sample_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/console.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/resultpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/__init__.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_widgets.py (modified)
	* src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified)
	* src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified)
	* src/sas/sasgui/perspectives/simulation/__init__.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/BaseInteractor.py (modified)
	* src/sas/sasgui/plottools/LabelDialog.py (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/PropertyDialog.py (modified)
	* src/sas/sasgui/plottools/SizeDialog.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/convert_units.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/README.rst (modified)
	* test/calculatorview/test/utest_gui_sld.py (modified)
	* test/calculatorview/test/utest_sld.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/pr_inversion/test/utest_explorer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_resolution_calculator.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/error_conditions.py (modified)
	* test/sasdataloader/test/sequence_tests.py (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)
	* run.py (modified)
	* test/calculatorview/__init__.py (added)
	* test/calculatorview/test/__init__.py (added)
	* test/corfunc/__init__.py (added)
	* test/corfunc/test/__init__.py (added)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/sasdataloader/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasguiframe/__init__.py (added)
	* test/sasguiframe/test/__init__.py (added)
	* test/sasinvariant/__init__.py (added)
	* test/sasinvariant/test/__init__.py (added)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)

	After merging conflict with master CR/LF


Sat, 08 Apr 2017 11:54:23 GMT Ricardo Ferraz Leal <ricleal@…> [168d359]
	* run.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)

	Log binnning working for SectorQ


Sat, 08 Apr 2017 08:37:19 GMT ajj [959eb01]
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/marketplace.rst (modified)
	* docs/sphinx-docs/source/user/menu_bar.rst (modified)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/custom_config.py (modified)
	* sasview/installer_generator.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* src/examples/data_generator/test_transfo.py (modified)
	* src/examples/data_generator/testdata_generator.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_text_panel.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/invariant/invariant_mapper.py (modified)
	* src/sas/sascalc/pr/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/distance_explorer.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/custom_pstats.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/data_state.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/dummyapp.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/gui_toolbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/pdfview.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified)
	* src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/console.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/detector_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/load_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sample_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/console.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/resultpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/__init__.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_widgets.py (modified)
	* src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified)
	* src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified)
	* src/sas/sasgui/perspectives/simulation/__init__.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/BaseInteractor.py (modified)
	* src/sas/sasgui/plottools/LabelDialog.py (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/PropertyDialog.py (modified)
	* src/sas/sasgui/plottools/SizeDialog.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/convert_units.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/README.rst (modified)
	* test/calculatorview/test/utest_gui_sld.py (modified)
	* test/calculatorview/test/utest_sld.py (modified)
	* test/pr_inversion/test/utest_explorer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_resolution_calculator.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/error_conditions.py (modified)
	* test/sasdataloader/test/sequence_tests.py (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)

	normalising line endings


Fri, 07 Apr 2017 13:51:47 GMT Ricardo Ferraz Leal <ricleal@…> [fa4af76]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)

	Refactoring


Fri, 07 Apr 2017 04:03:53 GMT andyfaff [6435594]
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)

	MAINT: improving dict access


Fri, 07 Apr 2017 02:15:08 GMT andyfaff [f3bf622]
	* setup.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/sasdataloader/test/testplugings.py (modified)

	MAINT: remove has_key occurences


Thu, 06 Apr 2017 17:17:21 GMT Ricardo Ferraz Leal <ricleal@…> [ccc7192]
	* src/sas/sascalc/dataloader/manipulations.py (modified)

	Cleaning and Refactoring


Thu, 06 Apr 2017 15:42:01 GMT Ricardo Ferraz Leal <ricleal@…> [9dda8cc]
	* src/sas/sascalc/dataloader/manipulations.py (modified)

	New style exceptions


Thu, 06 Apr 2017 15:04:57 GMT Ricardo Ferraz Leal <ricleal@…> [a470e88]
	* 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/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* test/calculatorview/__init__.py (added)
	* test/calculatorview/test/__init__.py (added)
	* test/corfunc/__init__.py (added)
	* test/corfunc/test/__init__.py (added)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/sasdataloader/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasguiframe/__init__.py (added)
	* test/sasguiframe/test/__init__.py (added)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/__init__.py (added)
	* test/sasinvariant/test/__init__.py (added)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)

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


Thu, 06 Apr 2017 15:04:42 GMT Ricardo Ferraz Leal <ricleal@…> [fd5d6eac]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* test/calculatorview/__init__.py (added)
	* test/calculatorview/test/__init__.py (added)
	* test/corfunc/__init__.py (added)
	* test/corfunc/test/__init__.py (added)
	* test/fileconverter/__init__.py (added)
	* test/fileconverter/test/__init__.py (added)
	* test/pr_inversion/__init__.py (added)
	* test/pr_inversion/test/__init__.py (added)
	* test/sascalculator/__init__.py (added)
	* test/sascalculator/test/__init__.py (added)
	* test/sasdataloader/__init__.py (added)
	* test/sasdataloader/plugins/__init__.py (added)
	* test/sasdataloader/test/__init__.py (added)
	* test/sasguiframe/__init__.py (added)
	* test/sasguiframe/test/__init__.py (added)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/__init__.py (added)
	* test/sasinvariant/test/__init__.py (added)
	* test/sasrealspace/__init__.py (added)
	* test/sasrealspace/test/__init__.py (added)

	better code. Remove warnings


Thu, 06 Apr 2017 13:20:42 GMT Adam Washington <adam.washington@…> [24c382a]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)
	* sasview/test/sesans_data/sphere2micron.ses (modified)
	* sasview/test/sesans_data/sphere_isis.ses (added)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sphere3micron.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)

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


Thu, 06 Apr 2017 13:15:56 GMT Adam Washington <adam.washington@…> [857cc58]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Fix unit conversion in sesans reader


Thu, 06 Apr 2017 13:13:06 GMT Adam Washington <adam.washington@…> [8e0dcac]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Handle missing columns in .ses format

	The uncertainties on spin echo ...


Thu, 06 Apr 2017 09:56:51 GMT Adam Washington <adam.washington@…> [d01b55c]
	* src/sas/sascalc/data_util/qsmearing.py (modified)

	Include wavelength information in the SesansTransform


Thu, 06 Apr 2017 09:52:01 GMT Adam Washington <adam.washington@…> [c44baf97]
	* src/sas/sascalc/dataloader/data_info.py (modified)

	Change default yacceptance and zacceptance

	This fixes a possible crash ...


Thu, 06 Apr 2017 08:40:32 GMT Adam Washington <adam.washington@…> [63d773c]
	* 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)

	Add yacceptance

	Needed to correspond to zacceptance for 2D sesans


Thu, 06 Apr 2017 08:36:51 GMT Adam Washington <adam.washington@…> [3c903ea]
	* .gitignore (modified)
	* run.py (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (added)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/logging.ini (added)
	* test/run_one.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (modified)
	* test/sasdataloader/test/isis_1_1_write_test.xml (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (modified)
	* test/utest_sasview.py (modified)
	* sasview/test/sesans_data/sphere2micron.ses (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_constants.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sphere3micron.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)

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


Thu, 06 Apr 2017 08:27:22 GMT Adam Washington <adam.washington@…> [747334d]
	* 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)

	Add yacceptance

	Needed to correspond to zacceptance for 2D sesans


Wed, 05 Apr 2017 17:03:41 GMT Adam Washington <adam.washington@…> [0ac6e11]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Start fixing sesans smearing for time of flight


Wed, 05 Apr 2017 15:48:57 GMT Adam Washington <adam.washington@…> [610af69]
	* src/sas/sascalc/data_util/qsmearing.py (modified)

	Change zaccept in qsmearing to angle

	The new Sesans format specifies an ...


Wed, 05 Apr 2017 14:33:21 GMT Adam Washington <adam.washington@…> [2b310602]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* test/sasdataloader/test/sphere3micron.ses (added)
	* test/sasdataloader/test/utest_sesans.py (added)

	Update SESANS reader to SESANS format v1.0


Wed, 05 Apr 2017 11:24:44 GMT Ricardo Ferraz Leal <ricleal@…> [64ca561]
	* run.py (modified)
	* sasview/logging.ini (modified)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* test/logging.ini (modified)
	* test/run_one.py (modified)

	Log not repeated any longer


Tue, 04 Apr 2017 22:15:55 GMT Adam Washington <adam.washington@…> [cb9feea8]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Pulled code out of conditional in sesans_reader.py


Tue, 04 Apr 2017 22:05:18 GMT Adam Washington <adam.washington@…> [56e2e3e]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Put error checking for empty sesans files into a smarter place


Tue, 04 Apr 2017 21:59:47 GMT Adam Washington <adam.washington@…> [bc6532e]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Try switch type annotation styles in sesans_reader.py


Tue, 04 Apr 2017 21:27:39 GMT Adam Washington <adam.washington@…> [35009a0]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Remove redundant code from sesans_reader

	I left in an old conditional ...


Tue, 04 Apr 2017 17:10:30 GMT Ricardo Ferraz Leal <ricleal@…> [f2940c4]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* .gitignore (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (added)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/logging.ini (added)
	* test/run_one.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (modified)
	* test/sasdataloader/test/isis_1_1_write_test.xml (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (modified)
	* test/utest_sasview.py (modified)

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


Tue, 04 Apr 2017 17:04:32 GMT Adam Washington <adam.washington@…> [41e0a3b]
	* check_packages.py (modified)
	* mac_setup_homebrew.sh (added)
	* run.py (modified)
	* sasview/local_config.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/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/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)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

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


Tue, 04 Apr 2017 17:00:50 GMT ajj [dd11014]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Fixing PR #55 broken merge


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


Tue, 04 Apr 2017 15:25:55 GMT GitHub <noreply@…> [ba22344]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* sasview/README.txt (modified)
	* sasview/local_config.py (modified)
	* setup.py (modified)
	* src/sas/sascalc/calculator/slit_length_calculator.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.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)

	Merge pull request #48 from andyfaff/numpy_igor_reader

	BUG: IgorReader


Tue, 04 Apr 2017 14:22:00 GMT Adam Washington <adam.washington@…> [2d866370]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Switch to static methods in sesans_reader.py

	The online style system ...


Tue, 04 Apr 2017 14:03:52 GMT Adam Washington <adam.washington@…> [09a0be5]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Add docstrings to sesans_reader utility functions


Tue, 04 Apr 2017 13:21:31 GMT Adam Washington <adam.washington@…> [388bd51]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Get sesans_reader utility functions out of the main namespace

	Move the ...


Tue, 04 Apr 2017 13:11:22 GMT Adam Washington <adam.washington@…> [def97a0]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Pass flake8 on sesans_reader.py

	Imrpove the code in sesans reader by ...


Tue, 04 Apr 2017 12:22:33 GMT Adam Washington <adam.washington@…> [ecc8d1a8]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Remove whitespace from sesans_reader.py code


Tue, 04 Apr 2017 12:15:03 GMT Adam Washington <adam.washington@…> [e935ddb1]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	Condensed sesans reader code

	The sesans reader code is smaller and now ...


Mon, 27 Mar 2017 16:10:36 GMT krzywon [8434365]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)

	Remove writing transmission spectrum to XML data files.


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


Fri, 24 Mar 2017 19:27:46 GMT andyfaff [bfba720]
	* src/sas/sascalc/calculator/slit_length_calculator.py (modified)

	MAINT: SlitlengthCalculator - removed float indexing


Fri, 24 Mar 2017 01:38:25 GMT andyfaff [36d69e1]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	MAINT: refactor IgorReader.py


Thu, 23 Mar 2017 00:10:15 GMT Paul Kienzle <pkienzle@…> [1a30720]
	* src/sas/sascalc/fit/BumpsFitting.py (modified)

	fit error reporting was using traceback.traceback.format_exc rather
	than ...


Thu, 09 Mar 2017 20:25:56 GMT krzywon [c94280c]
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)

	Further down PEP 8.


Thu, 09 Mar 2017 15:43:25 GMT krzywon [54544637]
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)

	PEP 8 cleanup as Paul K suggested.


Wed, 08 Mar 2017 21:27:44 GMT krzywon [082239e]
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)

	Modify the cansas HDF5 reader to comply with the NXcanSAS-1.0 release ...


Tue, 28 Feb 2017 21:29:52 GMT Paul Kienzle <pkienzle@…> [775e0b7]
	* src/sas/sascalc/data_util/qsmearing.py (modified)

	use relative import for local files


Mon, 27 Feb 2017 16:58:17 GMT krzywon [c221349]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)

	Split unit axis and label on "|" and then strip whitespace.


Fri, 24 Feb 2017 14:39:00 GMT GitHub <noreply@…> [7caf3e5]
	* setup.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* 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/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into sesans41


Fri, 24 Feb 2017 14:29:18 GMT Paul Kienzle <pkienzle@…> [9525358]
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	sesans reader: fix xaxis/yaxis labels so that they don't break the ...


Tue, 14 Feb 2017 21:28:07 GMT krzywon [2ffe241]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)

	Fix issues with loading 2D data in the SESANS branch and always set ...


Tue, 14 Feb 2017 20:27:46 GMT GitHub <noreply@…> [b5e9ce26]
	* .gitignore (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.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/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/sascalc/file_converter/c_ext/bsl_loader.c (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/pr/media/pr_help.rst (modified)
	* 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/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into sesans41


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 18:29:56 GMT krzywon [bcabf4e]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)

	2D masking loaded properly and mask is now saved as 1s and 0s as per ...


Tue, 07 Feb 2017 16:39:39 GMT krzywon [5e6df0e]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)

	Simplified the check for data error bars.


Tue, 07 Feb 2017 15:33:53 GMT krzywon [eb2dc13]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)

	Be sure 2D error data exists before trying to save it in projects and ...


Mon, 06 Feb 2017 22:02:46 GMT Paul Kienzle <pkienzle@…> [157b716]
	* src/sas/sascalc/data_util/qsmearing.py (modified)

	simplify interface to sesans transform


Mon, 06 Feb 2017 21:00:46 GMT krzywon [ad4632c]
	* 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)

	Save and load SESANS flag and zacceptance to/from project and
	analysis ...


Thu, 02 Feb 2017 22:00:36 GMT Paul Kienzle <pkienzle@…> [2ab9c432]
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)

	remove compiler warnings about uninitialized constants: if they are ...


Thu, 02 Feb 2017 13:17:46 GMT jhbakker [2a2b43a]
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* src/sas/sascalc/data_util/qsmearing.py (modified)

	hankel simplified, set_transform is now __init__,sesans test data is
	in ...


Mon, 30 Jan 2017 15:43:36 GMT krzywon [18501795]
	* src/sas/sascalc/dataloader/data_info.py (modified)

	Set the x_unit and y_unit in Data1D to class variables instead of ...


Fri, 20 Jan 2017 10:45:03 GMT jhbakker [20522e1]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Fixes based on Jeff's comments (20170119). Tested with 1D SESANS data
	on ...


Tue, 17 Jan 2017 21:10:19 GMT jhbakker [b5db35d]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)

	more bugfixes (stupid mistake on the sesansreader...)


Tue, 17 Jan 2017 19:18:58 GMT jhbakker [a9f579c]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Manually added in all the SESANS modifications from Jurtest


Thu, 12 Jan 2017 18:17:10 GMT krzywon [1905128]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)

	Speed up saving and loading 2D data in save states by putting all
	data ...


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, 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 ...


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.


Mon, 19 Dec 2016 12:23:36 GMT GitHub <noreply@…> [345e7e4]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.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/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Revert "Jurtest2"