# # ChangeLog for / in sasview # # Generated by Trac 1.0.1 # Dec 18, 2024 12:54:41 PM Tue, 28 Feb 2017 18:17:19 GMT GitHub [0d64713] * sasview/test/sesans_data/sphere2micron.ses (deleted) * sasview/test/sesans_data/spheres2micron.ses (added) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Revert "Sesans41" Tue, 28 Feb 2017 17:05:36 GMT GitHub [46f798f] * sasview/test/sesans_data/sphere2micron.ses (added) * sasview/test/sesans_data/spheres2micron.ses (deleted) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Merge pull request #31 from SasView/sesans41 Sesans integration into ... 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. Mon, 27 Feb 2017 15:18:44 GMT krzywon [e64a03e] * setup.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Merge branch 'ticket-756' of https://github.com/SasView/sasview into ... Mon, 27 Feb 2017 15:18:31 GMT krzywon [71601312] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Put the category name change in the right place. Mon, 27 Feb 2017 15:10:28 GMT krzywon [7a5aedd] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Move 'Custom Models' to 'Plugin Models' to name conversion. Mon, 27 Feb 2017 04:20:48 GMT butler [ddbac66] * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Fix remaining custom/customized to plugin conversion Mon, 27 Feb 2017 03:23:04 GMT butler [5295cf5] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) update documentation for plugin vs customized (and a few spelling ... Sat, 25 Feb 2017 20:33:43 GMT butler [ef2cdb3] * setup.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Merge remote-tracking branch 'origin/master' into ticket-756 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:35:37 GMT GitHub [cb05bfd] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * setup.py (modified) Merge pull request #36 from SasView/ticket-844 Ticket 844: Smearing ... 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 ... Wed, 22 Feb 2017 20:29:41 GMT krzywon [3d55219] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Check for slit smearing as well as pinhole, more pythonic truth checking ... Tue, 21 Feb 2017 21:22:47 GMT krzywon [03137f1] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Default dQ is now None. dQ from data is selected automatically if dta ... Tue, 21 Feb 2017 20:40:52 GMT krzywon [4387385] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Save states with 'Customized Models' category now load as 'Plugin ... Tue, 21 Feb 2017 15:51:59 GMT krzywon [1e13b53] * setup.py (modified) Modify setup.py to include all of the corfunc and file_converter ... Sun, 19 Feb 2017 23:02:07 GMT butler [11b094f] * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Merge remote-tracking branch 'origin/master' into ticket-756 Tue, 14 Feb 2017 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 16:05:25 GMT krzywon [6d2b50b] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Change the elif block to a dictionary search to minimize the number of ... 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 ... Tue, 07 Feb 2017 14:03:45 GMT krzywon [68adf86] * src/sas/sasgui/guiframe/dataFitting.py (modified) Apply a linear transform for SESANS data as default. 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 ... Mon, 06 Feb 2017 03:47:14 GMT butler [e92a352] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) replace "Customized Models" with Plugin Models in category lists. ... 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, 27 Jan 2017 20:58:23 GMT Steven C. Howell [1221196] * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) fix transpose typo in year Mon, 23 Jan 2017 02:32:42 GMT butler [51f1c347] * .gitignore (modified) update .gitignore to include .settings/ Mon, 23 Jan 2017 02:31:55 GMT butler [220b1e7] * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) update version number to 4.1 in init and sphinx. Also updated readme ... 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:34:45 GMT jhbakker [aad41bb] * src/sas/sasgui/guiframe/dataFitting.py (modified) small bugfix 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 Tue, 17 Jan 2017 12:21:59 GMT wojciech [ef0e644] * sasview/custom_config.py (modified) * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (added) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Merged with master after fixes in sasmodels lib documention Tue, 17 Jan 2017 12:20:37 GMT wojciech [ca6cbc1c] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Updated documentation for lib functions in sasmodels. Refers to ticket ... Fri, 13 Jan 2017 17:23:48 GMT smk78 [1dc8ec9] * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) Provisioning for #784. Changed TRANSFORM_LABEL to TRANSFORM_LABEL1. In ... Fri, 13 Jan 2017 15:52:21 GMT krzywon [18b7ca96] * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Merge branch 'ticket-795' into ticket-827 Fri, 13 Jan 2017 11:58:05 GMT Piotr Rozyczko [73cbeec] * sasview/custom_config.py (modified) * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (added) Opencl dialog (#29) Merged OpenCL dialog prototype branch * Support ... Thu, 12 Jan 2017 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, 10 Jan 2017 18:52:45 GMT krzywon [ae9b8bf] * sasview/local_config.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) The corfunc perspective now saves and loads in files with the extension ... Wed, 04 Jan 2017 11:28:20 GMT smk78 [27aabc1] * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) Changes to smearing help at ... Tue, 03 Jan 2017 18:12:00 GMT krzywon [83c09af] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Fit states and projects are now able to save 2D data. Loading is still ... Fri, 30 Dec 2016 16:33:07 GMT Doucet, Mathieu [c1681ea] * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Protect against incomplete models. Thu, 29 Dec 2016 18:57:56 GMT mathieu [b0bebdc] * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Adapt SasViewModel to new multiplication model replacement. Fixes #209 Fri, 23 Dec 2016 15:16:52 GMT krzywon [12361fd] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Trying to remove hidden characters in pagestate. Fri, 23 Dec 2016 15:16:21 GMT krzywon [2d09bc2] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Trying to remove hidden characters in pagestate. Wed, 21 Dec 2016 16:59:49 GMT krzywon [fa487d93] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Added versioning to pagestate and fit saves to ensure past changes are ... Wed, 21 Dec 2016 15:48:31 GMT krzywon [a6fccd7] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) Merge branch 'master' into ticket-795 Wed, 21 Dec 2016 15:48:26 GMT krzywon [9e0aa69a] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Added versioning to pagestate and fit saves for future use. Wed, 21 Dec 2016 14:31:55 GMT GitHub [bb3eb744] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Merge pull request #28 from SasView/ticket-811 Ticket 811 Tue, 20 Dec 2016 20:03:50 GMT krzywon [24fd27a] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) #826: Smearing should now be applied to 1D data with dQ data present. ... Tue, 20 Dec 2016 17:05:17 GMT krzywon [0de74af] * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Added a constant for "[plug-in] " to maintain consistency across ... Tue, 20 Dec 2016 12:59:08 GMT Paul Kienzle [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. Tue, 20 Dec 2016 00:51:49 GMT GitHub [06a4306] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Merge pull request #16 from SasView/ticket778 Ticket778 Mon, 19 Dec 2016 21:09:08 GMT krzywon [ca224b1] * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Delete all plots when resetting state. Mon, 19 Dec 2016 20:57:51 GMT krzywon [6b9e76f] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Flag 2 methods as static. Mon, 19 Dec 2016 18:59:52 GMT GitHub [8aec639] * 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/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (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/data_util/calcthread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) Merge branch 'master' into ticket-795 Mon, 19 Dec 2016 18:52:12 GMT GitHub [f845454] * 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/sasview.spec (added) * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) * sasview/version.txt (added) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.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/invariant/media/invariant_help.rst (modified) * test/sasdataloader/test/utest_ascii.py (modified) Merge branch 'master' into ticket-753 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 Fri, 16 Dec 2016 15:40:27 GMT krzywon [67b0a99] * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) #761: Constrained fit pages are now deleted if they no longer have any ... Fri, 16 Dec 2016 10:47:49 GMT wojciech [b742b8b5] * build_tools/jenkins_osx_build.sh (modified) Dummy commit to check if jenkins is up and running again 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 Wed, 14 Dec 2016 08:38:23 GMT wojciech [ec57735] * build_tools/jenkins_win64_build.bat (modified) Updated jenkins script for win64 Wed, 14 Dec 2016 07:48:29 GMT wojciech [1248c33] * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win_build.bat (modified) Adding sasmodels testing for OSX and Windows builds Wed, 14 Dec 2016 07:47:27 GMT wojciech [5dab2bc] * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win_build.bat (modified) Adding sasmodels testing for OSX and Windows builds Tue, 13 Dec 2016 14:56:00 GMT smk78 [4dd8d25] * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) Added new 2D test data set (the one that generated #824). Tue, 13 Dec 2016 12:00:16 GMT wojciech [cf67a45] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * build_tools/jenkins_linux_build.sh (modified) Adding sasmodels test to build script - Linux build first Tue, 13 Dec 2016 11:57:44 GMT wojciech [128c287] * build_tools/jenkins_linux_build.sh (modified) Adding sasmodels test to build script - Linux build first 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 ... Fri, 09 Dec 2016 18:52:27 GMT krzywon [0633048] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) #795: String parameters are now handled properly. Try/except blocks that ... 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 18:38:29 GMT krzywon [d7d0182] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Invalid type check on an array. Wed, 07 Dec 2016 18:33:52 GMT krzywon [9eb8fae] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Empty values for limits should still load in and show the upper 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 Wed, 07 Dec 2016 13:33:45 GMT GitHub [9300bfa] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Merge pull request #19 from SasView/ticket-772 Added descriptions of ... Tue, 06 Dec 2016 22:14:03 GMT Paul Kienzle [ca1eaeb] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) update equations in special function documentation Tue, 06 Dec 2016 15:52:56 GMT krzywon [a321c52] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Force all models to go through _convert_to_sasmodels routine to ensure ... Tue, 06 Dec 2016 14:06:16 GMT jhbakker [1cad8a4] * src/sas/sascalc/data_util/qsmearing.py (modified) cosmetic change to qsmearing.py Mon, 05 Dec 2016 19:52:56 GMT krzywon [77910cf] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Fixes #819: Category, form factor and structure factor names are now ... Mon, 05 Dec 2016 17:31:22 GMT krzywon [7ede832] * src/sas/sascalc/data_util/calcthread.py (modified) Consolidate all errors into one while running calcthread. Mon, 05 Dec 2016 17:30:29 GMT krzywon [1c6bad0] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Added patch to handle formfactor and category names that aren't saved in ... Mon, 05 Dec 2016 13:32:42 GMT krzywon [6fb6592] * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) Merge remote-tracking branch 'origin/ticket-820' into ticket-795 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 Thu, 01 Dec 2016 19:09:36 GMT krzywon [c9677c9] * sasview/sasview.spec (added) * sasview/version.txt (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) Merge branch 'master' into ticket-795 Thu, 01 Dec 2016 19:08:50 GMT krzywon [0b1d7d3] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Plugin models are loaded properly (if they can be found) and fixed a bug ... Wed, 30 Nov 2016 21:31:28 GMT krzywon [7602675] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) More general way to load in parameters by comparing names rather than by ... Wed, 30 Nov 2016 20:29:47 GMT krzywon [406644a] * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) #795: A few more models have been properly converted and tested to work. ... Wed, 23 Nov 2016 09:58:18 GMT wojciech [aa4b4f05] * sasview/sasview.spec (added) * sasview/version.txt (added) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasdataloader/test/utest_ascii.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) Merged with master 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