# # ChangeLog for src/sas/sascalc in sasview # # Generated by Trac 1.0.1 # Nov 25, 2024 3:27:13 PM 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 ... 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 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 ... 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 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 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, 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 ... Thu, 18 Aug 2016 14:19:09 GMT lewis [afbd172] * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) Pass 2D data dimesnsions to NXcanSASWriter to allow saving of non- ... Thu, 18 Aug 2016 12:35:43 GMT lewis [eb98f24] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (added) Refactor write method to its own class The cansas_reader_HDF5 read ... Thu, 18 Aug 2016 11:03:43 GMT lewis [8cb1a07] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Implement writing 2D data to NXcanSAS Thu, 18 Aug 2016 09:00:32 GMT lewis [1f6d293] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Write numerical values correctly Thu, 18 Aug 2016 08:56:48 GMT lewis [1ddf8f0] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Use Data object to set sasentry attributes Wed, 17 Aug 2016 15:55:19 GMT lewis [88d85c6] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Ensure SASdetector and SASsample are written/read correctly Wed, 17 Aug 2016 15:12:44 GMT lewis [54ba66e] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Begin implementation of cansas HDF5 writer Thu, 11 Aug 2016 12:21:59 GMT lewis [4699761] * build_tools/jenkins_win_build.bat (modified) * sasview/__init__.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/dataloader/readers/associations.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/convert_bsl_thread.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, 11 Aug 2016 12:19:11 GMT lewis [2c627ad] * build_tools/jenkins_win_build.bat (modified) * sasview/__init__.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/dataloader/readers/associations.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) * 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/local_perspectives/plotting/Plotter1D.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) Merge branch 'master' into corfunc Thu, 11 Aug 2016 12:16:28 GMT wojciech [713cc1c] * sasview/__init__.py (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) Added two readers to registry function, so mac build doesn't fail on ... Thu, 11 Aug 2016 11:33:53 GMT wojciech [e5c09cf] * src/sas/sascalc/dataloader/readers/associations.py (modified) Added readers to registry function, so they are bundeled to MacBuild Thu, 11 Aug 2016 01:32:49 GMT Paul Kienzle [deddda1] * src/sas/sascalc/calculator/BaseComponent.py (modified) sort paramList if params not in ordered dict Wed, 10 Aug 2016 13:29:25 GMT lewis [9d17c1d] * build_tools/jenkins_win_build.bat (modified) * src/sas/sascalc/calculator/sas_gen.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/convert_bsl_thread.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 Wed, 10 Aug 2016 13:28:59 GMT lewis [5a3c1f0] * build_tools/jenkins_win_build.bat (modified) * src/sas/sascalc/calculator/sas_gen.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) * 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/local_perspectives/plotting/Plotter1D.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) Merge branch 'master' into corfunc Wed, 10 Aug 2016 11:28:08 GMT Piotr Rozyczko [d2fd8fc] * build_tools/jenkins_win_build.bat (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) Remove cmd window popup and fix a unit test Wed, 10 Aug 2016 09:38:37 GMT lewis [0b1a677] * src/sas/sascalc/file_converter/cansas_writer.py (moved) * src/sas/sascalc/file_converter/convert_bsl_thread.py (modified) * src/sas/sascalc/file_converter/otoko_loader.py (moved) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Only perform writing on separate thread Also move reader/writer classes ... Tue, 09 Aug 2016 16:13:13 GMT lewis [35488b2] * src/sas/sascalc/file_converter/convert_bsl_thread.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Perform BSL file conversion on a separate thread Tue, 09 Aug 2016 14:33:31 GMT lewis [dbde451] * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.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) * 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/local_perspectives/plotting/Plotter1D.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) Merge branch 'master' into corfunc Tue, 09 Aug 2016 14:14:44 GMT lewis [d889d80] * src/sas/sascalc/file_converter/bsl_loader.py (modified) Close file when done in BSLLoader Tue, 09 Aug 2016 10:41:15 GMT lewis [dc8a553] * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) Show error message when binary file can't be loaded Tue, 09 Aug 2016 10:23:08 GMT lewis [9c500ab] * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/otoko_loader.py (modified) Add more descriptive error messages Tue, 09 Aug 2016 08:47:44 GMT lewis [3a38a8b] * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.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/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/cansas_writer.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/file_converter/otoko_loader.py (added) Merge branch 'master' into file-converter Tue, 09 Aug 2016 02:31:45 GMT Paul Kienzle [5213d22] * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) support old style custom formula models (but not sum or product) Mon, 08 Aug 2016 13:30:53 GMT lewis [e070dc0] * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) Raise error if error reading binary file instead of crashing Mon, 08 Aug 2016 12:30:57 GMT lewis [9b7c596] * build_tools/jenkins_win64_build.bat (added) * sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * 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/dataloader/readers/schema/cansas1d_invalid.xsd (added) * test/sasdataloader/test/cansas1d_notitle.xml (added) * test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (added) * test/sasdataloader/test/simpleexamplefile.h5 (added) * 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) * sasview/sasview.py (modified) * setup.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/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/bsl_loader.py (added) * src/sas/sasgui/perspectives/file_converter/cansas_writer.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-c Mon, 08 Aug 2016 12:16:18 GMT lewis [40b14f3] * build_tools/jenkins_win64_build.bat (added) * sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * 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/dataloader/readers/schema/cansas1d_invalid.xsd (added) * test/sasdataloader/test/cansas1d_notitle.xml (added) * test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (added) * test/sasdataloader/test/simpleexamplefile.h5 (added) * 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) * 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/local_perspectives/plotting/Plotter1D.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) Merge branch 'master' into corfunc Fri, 05 Aug 2016 15:48:33 GMT lewis [535e181] * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Begin implementing 2D BSL loader into GUI Fri, 05 Aug 2016 15:17:27 GMT krzywon [83b6408] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd (added) * test/sasdataloader/test/cansas1d_notitle.xml (added) * test/sasdataloader/test/utest_cansas.py (modified) Modified Cansas XML reader to attempt to load data that doesn't fully ... Fri, 05 Aug 2016 11:35:03 GMT lewis [c3f0114] * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) Remove debug statements and tidy up Fri, 05 Aug 2016 09:49:33 GMT lewis [6eaf89ea] * src/sas/sascalc/file_converter/bsl_loader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (modified) Implement reading BSL/OTOKO header file Fri, 05 Aug 2016 08:02:51 GMT lewis [e5308b6] * src/sas/sascalc/file_converter/bsl_loader.py (moved) Rename BSLLoader.py to bsl_loader.py Fri, 05 Aug 2016 08:02:21 GMT lewis [28e2b3a] * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) Set frame parameter in C class constructor Fri, 05 Aug 2016 08:00:40 GMT lewis [cc03f59] * src/sas/sascalc/file_converter/BSLLoader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) Implement getters in python class Thu, 04 Aug 2016 17:37:51 GMT krzywon [d72567e] * sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (added) * test/sasdataloader/test/simpleexamplefile.h5 (added) * test/sasdataloader/test/utest_cansas.py (modified) Refactored Cansas HDF5 reader to allow multiple instances of SASdata of ... Thu, 04 Aug 2016 16:11:45 GMT lewis [2760662] * src/sas/sascalc/file_converter/BSLLoader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) Implement getters in python class Thu, 04 Aug 2016 15:54:35 GMT lewis [18e7309] * run.py (modified) * setup.py (modified) * src/sas/sascalc/file_converter/BSLLoader.py (added) * src/sas/sascalc/file_converter/__init__.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) Add C extension for reading 2d BSL files Thu, 21 Jul 2016 10:41:46 GMT lewis [8976865] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/file_converter/cansas_writer.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Create own CansasReader subcless in preparation for writing multiple ... Thu, 21 Jul 2016 08:09:56 GMT lewis [d112c30] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Write run_name to SASentry.name instead of Run.name to agree with Mantid ... Tue, 19 Jul 2016 10:48:47 GMT lewis [3a9801f] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Write detector object in correct order Thu, 14 Jul 2016 08:07:40 GMT lewis [a8ed421] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * sasview/sasview.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.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/file_converter.py (added) Merge branch 'master' into file-converter Thu, 14 Jul 2016 07:56:03 GMT lewis [9f8209b] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.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) * 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/local_perspectives/plotting/Plotter1D.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) Merge branch 'master' into corfunc Wed, 13 Jul 2016 16:16:49 GMT lewis [fdbea3c] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Add ability to input detector metadata Wed, 13 Jul 2016 15:00:15 GMT krzywon [0f1e140] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Fix the broken unit tests. Wed, 13 Jul 2016 12:52:08 GMT krzywon [d398285] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (added) * 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) #237: Modified the CanSAS HDF5 reader to read the latest version output ... Tue, 12 Jul 2016 14:22:42 GMT lewis [20e09c6] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) Fix bug in extract_parameters Tue, 12 Jul 2016 14:10:33 GMT lewis [e73e723] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) Move string conversion from calculator class to panel Tue, 12 Jul 2016 12:34:57 GMT lewis [5878a9ea] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Minor tweaks to UI and calculator behaviour Tue, 12 Jul 2016 10:22:11 GMT lewis [8bdc103] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Take absolute value of polydispersity Tue, 12 Jul 2016 10:13:24 GMT lewis [d03228e] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Add backbone for Hilbert transform Tue, 12 Jul 2016 09:29:11 GMT lewis [eb320682] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Fix bug that occurs when correlation function has no linear section Mon, 11 Jul 2016 11:30:51 GMT lewis [a2db1ab] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Compute transform on a separate thread Mon, 11 Jul 2016 08:36:55 GMT lewis [a684c64] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) Implement saving/loading calculated parameters on project save Mon, 11 Jul 2016 08:36:55 GMT lewis [033c14c] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Implement extract parameters Mon, 11 Jul 2016 08:36:55 GMT lewis [9454a27] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) Use input background value for extrapolation Mon, 11 Jul 2016 08:36:55 GMT lewis [6970e51] * src/sas/sascalc/corfunc/corfunc_calculator.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) Add some docstrings Mon, 11 Jul 2016 08:36:55 GMT lewis [911dbe4] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) Add transform functionality