# # ChangeLog for src/sas/sascalc in sasview # # Generated by Trac 1.0.1 # Dec 26, 2024 6:05:39 PM Fri, 07 Jul 2017 19:07:02 GMT krzywon [7c24685] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Fix issue loading APS NxCansas data. Sun, 09 Apr 2017 09:38:18 GMT krzywon [527a190] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) Loading XML files saved through no longer throwing errors. see #938 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. Fri, 24 Mar 2017 19:27:46 GMT andyfaff [bfba720] * src/sas/sascalc/calculator/slit_length_calculator.py (modified) MAINT: SlitlengthCalculator - removed float indexing Thu, 23 Mar 2017 00:10:15 GMT Paul Kienzle [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 [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 [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 [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 [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 [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 [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 [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 [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 [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 [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" Mon, 19 Dec 2016 09:40:37 GMT jhbakker [55bc5a7f] * build_tools/jenkins_osx_build.sh (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * 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/fitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' into Jurtest2 Thu, 15 Dec 2016 20:55:11 GMT krzywon [bbd0f37] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) #826: CanSAS HDF5 reader reads in the Qdev data now. Thu, 15 Dec 2016 09:16:17 GMT jhbakker [e1e41de] * 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/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * 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) Merge branch 'master' into Jurtest Mon, 12 Dec 2016 11:24:14 GMT jhbakker [c6728e1] * src/sas/sascalc/data_util/qsmearing.py (modified) Limit Sesanstransform q-space array size to prevent Memerror on 32-bit ... Wed, 07 Dec 2016 21:06:16 GMT krzywon [b2b36932] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) #824: 2D data without detector information can now use the slicers, and ... Wed, 07 Dec 2016 14:16:33 GMT jhbakker [f668101] * .pydevproject (modified) * sasview/images/tudelft_logo.png (added) * sasview/sasview.spec (added) * sasview/setup_exe.py (modified) * sasview/version.txt (added) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/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/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_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/sasdataloader/test/utest_ascii.py (modified) * 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) Merge branch 'master' into Jurtest Tue, 06 Dec 2016 14:06:16 GMT jhbakker [1cad8a4] * src/sas/sascalc/data_util/qsmearing.py (modified) cosmetic change to qsmearing.py Fri, 02 Dec 2016 21:56:54 GMT Paul Kienzle [1a5d5f2] * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) send errors back from fitting. Fixes #820 Sun, 20 Nov 2016 12:54:54 GMT jhbakker [632e2e8] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) Merge branch 'Jurrian1D_optSESclass' into Jurrian1D_opt Sun, 20 Nov 2016 12:36:52 GMT jhbakker [4466a6a] * src/sas/sascalc/data_util/qsmearing.py (modified) SESANS optimizations Sun, 20 Nov 2016 12:32:48 GMT jhbakker [e4078ed] * src/sas/sascalc/data_util/qsmearing.py (modified) Sesans optimization Sun, 20 Nov 2016 10:47:39 GMT jhbakker [a5b8253] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) some small fixes Sun, 20 Nov 2016 10:36:43 GMT jhbakker [55db501] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) test branch for SESANS class in sesans.py Sun, 13 Nov 2016 13:04:05 GMT jhbakker [a01af35] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Hankel trafo optimized, sesans_reader code cleaned up, hankel matrix ... Thu, 10 Nov 2016 15:40:33 GMT jhbakker [f5e226c9] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) Correct implementation of fast SESANS fitting Wed, 09 Nov 2016 20:58:30 GMT jhbakker [4581ac9] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Experimenting with optimization to Hankel trafo Wed, 09 Nov 2016 13:46:54 GMT krzywon [d2471870] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) Throw exception from ASCII reader when no data is loaded to loading with ... Tue, 11 Oct 2016 15:09:47 GMT jhbakker [9087214] * build_tools/requirements.txt (modified) * check_packages.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/index.old (deleted) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (added) * 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/local_config.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/images/tudelft_logo.png (added) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (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/python_shell_help.rst (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * 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 (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (added) * src/sas/sasgui/perspectives/corfunc/media/profile1.png (added) * src/sas/sasgui/perspectives/corfunc/media/profile2.png (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/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/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * 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/plottools/plottables.py (modified) Merge branch 'master' into Jurrian1D, fingers crossed! Tue, 11 Oct 2016 13:38:13 GMT jhbakker [392056d] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) This version of SESANS integration will be merged to master Mon, 10 Oct 2016 20:32:09 GMT jhbakker [1fac6c0] * 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/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) SESANS is almost working, but this is NOT a stable version! Mon, 10 Oct 2016 18:16:59 GMT ajj [68669da] * src/sas/sascalc/fit/MultiplicationModel.py (modified) Updating MultiplicationModel to deal with results of fixing #657. Fixes ... Mon, 10 Oct 2016 15:52:19 GMT ajj [fd62331] * src/sas/sascalc/fit/MultiplicationModel.py (modified) Updating muliplicationmodel to be correct. Fixes #750 Sat, 08 Oct 2016 19:33:04 GMT jhbakker [51a4d78] * .gitignore (modified) * .travis.yml (modified) * build_tools/requirements.txt (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/test/testdata_help.rst (deleted) * docs/sphinx-docs/source/user/README-ABOUT-TOCTREE-FILES.TXT (modified) * docs/sphinx-docs/source/user/gpu_computations.rst (deleted) * docs/sphinx-docs/source/user/opencl_installation.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/BatchGridClassLayout.png (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/M_angles_pic.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/data_explorer_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/guinier_fit.png (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/hand_menu.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_oper_pic.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_operator_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_calculator_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_tutor.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/dm_eq.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_debye_eq.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_i.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_mag_pic.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_sas_help.html (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/image_viewer_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/load_image.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqx.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqy.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mxp.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/myp.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mzp.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pdb_combo.jpg (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_convert.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_plot.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pycrust_example.png (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/corfunc/corfunc_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (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/working.rst (modified) * sasview/default_categories.json (deleted) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/1d_data/Anton-Paar.pdh (moved) * 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/sld_file.sld (moved) * sasview/test/media/testdata_help.rst (modified) * sasview/test/other_files/dist _THETA_weights.txt (moved) * sasview/test/other_files/phi_weights.txt (moved) * sasview/test/other_files/radius_dist.txt (moved) * sasview/test/other_files/theta_weights.txt (moved) * sasview/test/save_states/constrained_fit_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (moved) * sasview/test/save_states/project_multiplicative_constraint.svs (added) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.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/gui_manager.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.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/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'ajj_sesans' into Jurrian1D Sat, 08 Oct 2016 18:34:03 GMT jhbakker [7988501] * src/sas/sascalc/dataloader/data_info.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/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Data1D class changed to include SESANS Data format Sat, 08 Oct 2016 18:13:22 GMT ajj [f7bc948] * src/sas/sascalc/data_util/qsmearing.py (modified) changes to qsmearing to try to accommodate sesans Sat, 08 Oct 2016 18:12:46 GMT ajj [24f6f4a] * .gitignore (modified) * .travis.yml (modified) * LICENSE.TXT (added) * build_tools/requirements.txt (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/test/testdata_help.rst (deleted) * docs/sphinx-docs/source/user/README-ABOUT-TOCTREE-FILES.TXT (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/gpu_computations.rst (deleted) * docs/sphinx-docs/source/user/menu_bar.rst (added) * docs/sphinx-docs/source/user/opencl_installation.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/BatchGridClassLayout.png (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/M_angles_pic.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/data_explorer_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/guinier_fit.png (deleted) * docs/sphinx-docs/source/user/sasgui/guiframe/hand_menu.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_oper_pic.png (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_operator_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_calculator_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_tutor.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/dm_eq.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_debye_eq.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_i.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_mag_pic.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_sas_help.html (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/image_viewer_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.rst (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/load_image.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqx.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqy.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mxp.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/myp.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mzp.gif (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pdb_combo.jpg (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_convert.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_plot.bmp (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pycrust_example.png (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/working.rst (modified) * run.py (modified) * sasview/default_categories.json (deleted) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/sasview.py (modified) * 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/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/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) * 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/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/__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/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.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/local_perspectives/plotting/Plotter1D.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/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (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/corfunc_help.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/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/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/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.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) * src/sas/sascalc/data_util/qsmearing.py (modified) Merge branch 'master' into ajj_sesans Fri, 07 Oct 2016 15:28:39 GMT mathieu [1b1a1c1] * src/sas/sascalc/dataloader/data_info.py (modified) Add tolerance to data ops. Fixes #493 Thu, 06 Oct 2016 22:01:52 GMT jhbakker [1b82623] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Halfway removing SESANSdata1D mentions Thu, 06 Oct 2016 16:35:24 GMT GitHub [8d3d20a] * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/local_config.py (modified) * sasview/sasview.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/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.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/corfunc_help.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/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) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * build_tools/sasview_deploy_test.au3 (modified) * build_tools/travis_build.sh (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/gpu_computations.rst (added) * docs/sphinx-docs/source/user/menu_bar.rst (added) * docs/sphinx-docs/source/user/opencl_installation.rst (added) * docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview.latestversion (deleted) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * sasview/images/ansto_logo.png (added) * sasview/images/ornl_logo.png (added) * sasview/setup_exe.py (modified) * sasview/test/1d_data/rpa_igor.txt (added) * 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) * setup.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/pr/invertor.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.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/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/guiframe/media/guinier_fit.png (modified) * src/sas/sasgui/guiframe/utils.py (modified) * 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/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (added) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.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/media/pr_help.rst (modified) * test/fileconverter/test/cansas1d.xml (added) * test/fileconverter/test/exp18_14_igor_2dqxqy.dat (added) * test/fileconverter/test/export2d.h5 (added) * test/fileconverter/test/utest_nxcansas_writer.py (added) * test/sasdataloader/test/utest_ascii.py (modified) Merge pull request #11 from SasView/corfunc Implement Correlation ... Thu, 06 Oct 2016 16:21:22 GMT GitHub [0639476] * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * sasview/sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/__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/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) * 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) * .travis.yml (modified) * Vagrantfile (modified) * build_tools/sasview_deploy_test.au3 (modified) * build_tools/travis_build.sh (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/gpu_computations.rst (added) * docs/sphinx-docs/source/user/menu_bar.rst (added) * docs/sphinx-docs/source/user/opencl_installation.rst (added) * docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (modified) * docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sas_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/slit_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/residuals_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.copy (deleted) * 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.latestversion (deleted) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * sasview/images/ansto_logo.png (added) * sasview/images/ornl_logo.png (added) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/test/1d_data/rpa_igor.txt (added) * 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) * 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/xml_reader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.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/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.copy (deleted) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/guiframe/media/guinier_fit.png (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (added) * src/sas/sasgui/perspectives/fitting/media/residuals_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_help.copy (deleted) * src/sas/sasgui/perspectives/pr/media/pr_help.copy (deleted) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * test/sasdataloader/test/utest_ascii.py (modified) Merge pull request #12 from lewisodriscoll/file-converter Implement ... Wed, 05 Oct 2016 23:21:51 GMT ajj [87b9447] * src/sas/sascalc/data_util/qsmearing.py (modified) first attempt at using hankel transform as resolution function (not ... Wed, 05 Oct 2016 23:05:24 GMT ajj [44c0746] * src/sas/sascalc/data_util/qsmearing.py (modified) interim commit to deal with git annoyance Wed, 14 Sep 2016 15:33:30 GMT krzywon [a235f715] * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) #500: Final changes to Anton Paar SAXSESS reader. Wed, 14 Sep 2016 13:41:14 GMT krzywon [7d94915] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) Fixes #658: ASCII reader files less than 5 lines long get thrown out. Tue, 13 Sep 2016 20:25:23 GMT krzywon [67cc2f7] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) Fixes #658: Modified ASCII reader to only accept data from lines with ... Thu, 01 Sep 2016 18:36:07 GMT krzywon [654e8e0] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) Resolves #644 and #642: Improved loading performance for cansas XML ... Wed, 31 Aug 2016 15:07:47 GMT ajj [2c60f304] * src/sas/sascalc/pr/invertor.py (modified) Fixing issue with dmax in P(r). Now logs value error rather than ... Tue, 23 Aug 2016 16:06:09 GMT lewis [5e906207] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Read all metadata from HDF5 files Tue, 23 Aug 2016 15:39:32 GMT lewis [f00691d4] * src/sas/sascalc/file_converter/bsl_loader.py (modified) Correctly set BSL Q-axis units Tue, 23 Aug 2016 14:39:36 GMT lewis [be88076] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Correctly read and write run_name Tue, 23 Aug 2016 14:16:36 GMT lewis [7fce2bc] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Implement writing SASnote in NXcansSASWriter Tue, 23 Aug 2016 13:34:13 GMT lewis [0836f77] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Write source metadata to NXcanSAS Tue, 23 Aug 2016 12:31:46 GMT lewis [9ddffe0] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Correctly write orientation vectors Tue, 23 Aug 2016 11:11:28 GMT lewis [ac3353d] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Write more metadata to NXcanSAS files Mon, 22 Aug 2016 11:34:56 GMT lewis [ff11b21] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) Show extrapolation parameters in GUI Also change I_obs label to I_obs - ... Mon, 22 Aug 2016 09:03:51 GMT lewis [c97d76a] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) Add constraint that sigma > 0 Also update the help file to reflect this ... Fri, 19 Aug 2016 15:02:55 GMT lewis [2387abc] * build_tools/deploy.bat (added) * build_tools/sasview_deploy_test.au3 (added) * build_tools/test_deployment.bat (added) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/installer_generator.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd (deleted) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (added) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (added) * src/sas/sasgui/guiframe/data_panel.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/media/data_explorer_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/RangeDialog.py (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * 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/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/corfunc_help.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/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) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Fri, 19 Aug 2016 14:55:29 GMT lewis [0fcb097] * build_tools/deploy.bat (added) * build_tools/test_deployment.bat (added) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * sasview/sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_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/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) * 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) Merge branch 'master' into file-converter Fri, 19 Aug 2016 14:52:27 GMT lewis [45d7662] * src/sas/sascalc/dataloader/data_info.py (modified) Show 2D data shape in Data Info window (closes #623) Fri, 19 Aug 2016 14:48:25 GMT lewis [479799c] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Correctly set y_bins in cansas_reader_HDF5 Fri, 19 Aug 2016 13:21:28 GMT lewis [fdd3ba1] * build_tools/sasview_deploy_test.au3 (modified) * sasview/installer_generator.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.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/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) Merge branch 'master' into file-converter Fri, 19 Aug 2016 13:03:25 GMT krzywon [4abcc93a] * sasview/sasview.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Fri, 19 Aug 2016 13:03:10 GMT krzywon [5f26aa4] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Fix cansas XML reader issues to resolve broken unit tests. Fri, 19 Aug 2016 12:58:15 GMT lewis [a4deca6] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Set data.x_bins and data.y_bins in CanSAS 2.0 reader (references #622) Fri, 19 Aug 2016 12:57:54 GMT lewis [a854f21] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Fix cansas_reader_HDF5 unit tests I'm not sure why the first value of ... Fri, 19 Aug 2016 12:57:38 GMT lewis [d65fb2f] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Improve efficiency of CanSAS 2.0 reader When it came to reading the Q ... Fri, 19 Aug 2016 11:21:33 GMT lewis [a14fa99] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Ensure Idev is set correctly on 1D data when writing to NXcanSAS Fri, 19 Aug 2016 10:43:06 GMT lewis [346d56e] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Allow adding metadata to 2d files and ensure it's written correctly Fri, 19 Aug 2016 10:08:16 GMT lewis [995f4eb] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Ensure CanSAS 2.0 files are closed after reading Fri, 19 Aug 2016 10:07:39 GMT lewis [9f4d891] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Write I uncertainty data to NXcanSAS files Fri, 19 Aug 2016 09:20:16 GMT lewis [fe498b83] * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Refactor to make use of x_bins and y_bins Fri, 19 Aug 2016 08:44:50 GMT lewis [ac370c5] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Set data.x_bins and data.y_bins in CanSAS 2.0 reader (references #622) Fri, 19 Aug 2016 08:11:40 GMT lewis [7f71637] * build_tools/sasview_deploy_test.au3 (modified) * sasview/sasview.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/schema/cansas1d_invalid.xsd (deleted) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (added) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * test/sasdataloader/test/utest_cansas.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.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/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) Merge branch 'master' into file-converter Thu, 18 Aug 2016 19:33:37 GMT krzywon [1686a333] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) Added compatibility with save/load projects and analysis. Thu, 18 Aug 2016 16:52:59 GMT krzywon [250fec92] * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd (deleted) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (added) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (added) * test/sasdataloader/test/utest_cansas.py (modified) Closes #596: Major rewrite to canSAS XML reader to create separate ... Thu, 18 Aug 2016 14:52:06 GMT lewis [3d6ab79] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Fix cansas_reader_HDF5 unit tests I'm not sure why the first value of ... Thu, 18 Aug 2016 14:33:24 GMT lewis [e9e777c] * src/sas/sascalc/file_converter/convert_bsl_thread.py (deleted) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Modify converter panel to use NXcanSAS writer Thu, 18 Aug 2016 14:19:47 GMT lewis [7bd6860a] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Improve efficiency of CanSAS 2.0 reader When it came to reading the Q ...