# # ChangeLog for src/sas/sascalc/dataloader in sasview # # Generated by Trac 1.0.1 # Nov 28, 2024 8:21:39 PM Tue, 05 Dec 2017 17:29:37 GMT GitHub [3053a4a] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) remove infinite loop from sesans reader (#129) Tue, 05 Dec 2017 13:54:20 GMT GitHub [79c9ce5] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * docs/sphinx-docs/source/_extensions/dollarmath.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/qsmearing.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted) * 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/media/fitting.rst (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge pull request #122 from llimeht/tmp/filereader-class Fix instance ... Mon, 20 Nov 2017 18:15:52 GMT Paul Kienzle [2469df7] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/fit/qsmearing.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.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/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) lint: update 'if x==True/False' to 'if x/not x:' Sat, 04 Nov 2017 13:20:24 GMT Stuart Prescott [cb11a25] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Fix instance vs class variables in FileReader Class variables get ... Thu, 02 Nov 2017 09:21:47 GMT Stuart Prescott [20fa5fe] * src/examples/test_panel2D.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/file_converter/otoko_loader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasview/sasview.py (modified) Fix lots more typos in comments and docs Fri, 27 Oct 2017 07:39:38 GMT krzywon [1576693] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Move state reset to end of file read to be more thread friendly. Wed, 25 Oct 2017 09:46:56 GMT krzywon [61f329f0] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Reset file reader class data state each time a new data file is loaded. Thu, 28 Sep 2017 19:40:02 GMT krzywon [2b538cd] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Modify documentation and add instance check for numpy arrays in HDF5 ... Tue, 26 Sep 2017 19:16:36 GMT Paul Kienzle [1efbc190] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sasgui/guiframe/config.py (modified) fix merge errors Mon, 25 Sep 2017 21:35:29 GMT Paul Kienzle [9e6aeaf] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasview/sasview.py (modified) * src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved) * src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/odict.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/__init__.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_sld.py (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) Merge branch 'ticket-853-fit-gui-to-calc' into py3 Mon, 25 Sep 2017 21:01:30 GMT Paul Kienzle [66000ae] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved) * src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved) * .gitignore (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/__init__.py (deleted) * sasview/sasview.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/dls_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (added) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (added) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (added) * src/sas/sasview/test/2d_data/MAR07262.ASC (added) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (added) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'ticket-869' into ticket-887-reorg Mon, 25 Sep 2017 20:26:30 GMT krzywon [62160509] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Check for units saved in v4.1.0 and convert to current. Mon, 25 Sep 2017 20:01:22 GMT krzywon [ffb6474] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) Trim last character from sample thickness in ABS reader to remove the ... Mon, 25 Sep 2017 17:58:13 GMT krzywon [deaa0c6] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Load fit states and project filess with 2D data sets using new loader ... Mon, 25 Sep 2017 15:51:21 GMT krzywon [7b07fbe] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Move generic loading functions from cansas_reader into ... Mon, 25 Sep 2017 15:13:29 GMT Paul Kienzle [9efdb29] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) further python3 conversion cleanup for cansas Sat, 23 Sep 2017 20:33:43 GMT Paul Kienzle [aaa801e] * .gitignore (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/__init__.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/fit/models.py (modified) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/dls_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (moved) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (added) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (added) * src/sas/sasview/test/2d_data/MAR07262.ASC (added) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (added) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/odict.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/__init__.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.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/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_sld.py (moved) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) Merge branch 'ticket-853-fit-gui-to-calc' into py3 Sat, 23 Sep 2017 16:24:21 GMT Paul Kienzle [c8321cfc] * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) support red2d reader in python 3 Fri, 22 Sep 2017 23:40:41 GMT Paul Kienzle [7b50f14] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) restore python 2 functionality Fri, 22 Sep 2017 23:23:30 GMT Paul Kienzle [46cf4c9] * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) use decoded stream for .abs reader; assume nxsunit exists Fri, 22 Sep 2017 23:15:44 GMT Paul Kienzle [f7d720f] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) use decoded stream for ascii reader Fri, 22 Sep 2017 23:14:38 GMT Paul Kienzle [e6e89c4] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) exec magic for dereferencing default units didn't work in python 3 Fri, 22 Sep 2017 23:12:31 GMT Paul Kienzle [5a6a84e] * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) etree returns bytes instead of unicode Fri, 22 Sep 2017 23:08:07 GMT Paul Kienzle [8641070] * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) use decoded stream for red2d reader Fri, 22 Sep 2017 23:07:32 GMT Paul Kienzle [849094a] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) use decoded stream for sesans reader Fri, 22 Sep 2017 23:07:02 GMT Paul Kienzle [af3e9f5] * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) use decoded stream for danse reader Fri, 22 Sep 2017 23:06:16 GMT Paul Kienzle [5c5e7fd] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) convert bytes to string when reading from HDF Fri, 22 Sep 2017 23:04:34 GMT Paul Kienzle [a5bd87a] * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) use decoded stream for anton-paar saxs reader Fri, 22 Sep 2017 23:03:34 GMT Paul Kienzle [26183bf] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) flow data reads through a single interface so we can control bytes to ... Fri, 22 Sep 2017 22:59:52 GMT Paul Kienzle [dc8d1c2] * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) python 3 doesn't support list.sort(cmp=...) Fri, 22 Sep 2017 20:01:32 GMT Paul Kienzle [574adc7] * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/odict.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/__init__.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/file_converter/nxcansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/fit/pagestate.py (modified) * src/sas/sascalc/fit/pluginmodel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/utest_sasview.py (modified) convert sascalc to python 2/3 syntax Thu, 21 Sep 2017 19:12:37 GMT Paul Kienzle [724af06] * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/rst_prolog (modified) * installers/README.txt (modified) * installers/sasview.spec (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.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/invariant/invariant.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (added) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (added) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (added) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (added) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld1.png (added) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.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/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (added) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (added) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (added) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (added) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld1.png (added) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/corfunc/test/utest_corfunc.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/utest_sasview.py (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/sasview.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/dls_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (added) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (added) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (added) * src/sas/sasview/test/2d_data/MAR07262.ASC (added) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (added) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'master' into ticket-887-reorg Wed, 20 Sep 2017 23:31:00 GMT Paul Kienzle [488f3a5] * src/sas/sascalc/dataloader/readers/__init__.py (modified) remove unused get_data_path function from readers Fri, 15 Sep 2017 18:48:18 GMT krzywon [ae69c690] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Ensure dxl and dxw and the same length as each other and as x. Fri, 15 Sep 2017 16:01:21 GMT krzywon [590b5c2] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Load dxl and dxw data in the same way x, y, dx, and dy are to ensure ... Thu, 14 Sep 2017 18:25:41 GMT krzywon [4660990] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Remove empty dx and dy arrays. Thu, 14 Sep 2017 14:43:20 GMT krzywon [c54c965] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Modify base file reader class and cansas reader to properly load save ... Mon, 11 Sep 2017 14:12:16 GMT krzywon [cd57c7d4] * README.md (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.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/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' into 4_1_issues # Conflicts: # ... Fri, 08 Sep 2017 15:22:46 GMT krzywon [c9ecd1b] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Comment NXcanSAS reader and remove unused variable from fitpanel. Thu, 07 Sep 2017 18:04:43 GMT krzywon [a78a02f] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Make suggested changes for unit test fixes. Fri, 25 Aug 2017 20:16:14 GMT krzywon [d713729] * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) Fix the danse_reader and remove obsolete unit tests. Thu, 24 Aug 2017 18:16:07 GMT krzywon [17e257b5] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Fix the broken unit tests associated with the readers. Mon, 21 Aug 2017 14:16:13 GMT lewis [dcb91cf] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.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/ascii2d_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/valid_cansas_xml.xml (added) Make suggested changes Fri, 04 Aug 2017 08:56:58 GMT lewis [ce8c7bd] * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) Remove support for loading .d1d files HFIR no longer use the .d1d ... Wed, 02 Aug 2017 10:59:11 GMT lewis [3a81cd9] * src/sas/sascalc/dataloader/loader.py (modified) Ensure error messages are displayed correctly Wed, 02 Aug 2017 10:58:22 GMT lewis [f994e8b1] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) Display warning when ISIS 2D ASCII data is loaded Wed, 02 Aug 2017 09:48:29 GMT lewis [3eb7bf2] * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) Better comments and remove unused IgorReader Wed, 02 Aug 2017 09:09:59 GMT lewis [be43448] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Fix sesans reader Wed, 02 Aug 2017 08:41:43 GMT lewis [83ee7258] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Remove unused code Wed, 02 Aug 2017 08:30:50 GMT lewis [511ccb2d] * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) Remove Nexus reader Tue, 01 Aug 2017 16:02:35 GMT lewis [5a8cdbb] * check_packages.py (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasdataloader/test/write_test.xml (deleted) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.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/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'master' into ticket-876 Tue, 01 Aug 2017 15:36:38 GMT lewis [248ff73] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) Ensure unit tests pass utest_averaging still fails as it relies on ... Tue, 01 Aug 2017 10:36:13 GMT lewis [b2c28a5] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Refactor sesans_reader to use FileReader class Tue, 01 Aug 2017 09:19:46 GMT lewis [713a047] * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) Refactor danse_reader to use FileReader class Tue, 01 Aug 2017 09:00:20 GMT lewis [a78433dd] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) Ensure loaded data is always sorted correctly Mon, 31 Jul 2017 11:25:56 GMT lewis [2f85af7] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) Refactor red_2d_reader to use FileReader class Mon, 31 Jul 2017 10:28:48 GMT lewis [fafe52a] * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Refactor Anton Paar SAXS reader to use FileReader class Mon, 31 Jul 2017 09:07:23 GMT lewis [0615d54] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Correctly set error message in CanSAS XML reader Thu, 27 Jul 2017 16:13:00 GMT lewis [8dec7e7] * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Raise DefaultReaderException in NXcanSAS reader and handle correctly Thu, 27 Jul 2017 15:08:18 GMT lewis [9d786e5] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Refactor NXcanSAS reader to use FileReader class Thu, 27 Jul 2017 11:11:42 GMT lewis [0b79323] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Re-implement 2D CanSAS XML support Thu, 27 Jul 2017 10:38:11 GMT lewis [7477fb9] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Refactor CanSAS reader to properly utilise FileReader Temporarily ... Wed, 26 Jul 2017 11:26:45 GMT lewis [bc570f4] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) Refactor CanSASReader/XMLReader to use FileReader class Wed, 26 Jul 2017 10:31:27 GMT lewis [3ece5dd] * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) Raise and catch correct exceptions in CanSAS XML reader Mon, 24 Jul 2017 14:27:05 GMT krzywon [6a455cd3] * .gitattributes (modified) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * build_tools/travis_build.sh (modified) * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * mac_setup_homebrew.sh (added) * run.py (modified) * sasview/__init__.py (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/welcome_panel.py (modified) * sasview/wxcruft.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_panel.py (modified) * src/examples/test_panel2D.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/err1d.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/images/dls_logo.png (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/__init__.py (moved) * test/calculatorview/test/__init__.py (moved) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/corfunc/__init__.py (moved) * test/corfunc/test/__init__.py (added) * test/corfunc/test/utest_corfunc.py (modified) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/export2d.h5 (deleted) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/logging.ini (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * sasview/README.txt (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Merge branch 'master' into 4_1_issues # Conflicts: # ... Fri, 07 Jul 2017 19:07:02 GMT krzywon [7c24685] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Fix issue loading APS NxCansas data. Fri, 19 May 2017 13:41:37 GMT krzywon [324e0bf] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Support numpy v1.12 - integer indices. Thu, 18 May 2017 19:16:57 GMT GitHub [7132e49] * run.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge pull request #77 from SasView/log_binning Closes #920 Thu, 18 May 2017 18:48:06 GMT Ricardo M. Ferraz Leal [46cd1c3] * src/sas/sascalc/dataloader/manipulations.py (modified) Added Design by contract Tue, 16 May 2017 12:16:20 GMT GitHub [2f17d40] * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (added) * .gitignore (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (modified) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/wxcruft.py (modified) * setup.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/fileconverter/test/export2d.h5 (deleted) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (deleted) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) Merge pull request #76 from rprospero/master Update SESANS reader to ... Tue, 02 May 2017 15:24:16 GMT krzywon [371b9e2] * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Add support for a fourth reader exception and start the removal of ... Tue, 02 May 2017 12:07:40 GMT Paul Kienzle [5e903e8b] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (deleted) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * run.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) Merge branch 'master' into log_binning Mon, 01 May 2017 04:26:11 GMT andyfaff [a1b8fee] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) MAINT: from __future__ import print_function Sun, 30 Apr 2017 22:15:17 GMT andyfaff [9c3d784] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) MAINT: using print function Thu, 20 Apr 2017 19:03:34 GMT krzywon [5d8f9b3] * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) Remove unused imports and minor code cleanup. Thu, 20 Apr 2017 19:00:56 GMT krzywon [7a5d066] * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) Replace defaults.json file with constant to eliminate json dependency Thu, 20 Apr 2017 18:58:00 GMT krzywon [080d88e] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) Minor cleanup in ASCII reader. Tue, 18 Apr 2017 18:56:03 GMT krzywon [ad92c5a] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) ABS reader converted to new system. Mon, 17 Apr 2017 20:30:10 GMT krzywon [da8bb53] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) Added a 4th data loader exception for generic readers that cannot open ... Mon, 17 Apr 2017 19:16:39 GMT krzywon [8ffafd1] * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Fix indexing issue that broke unit tests. Mon, 17 Apr 2017 18:39:50 GMT krzywon [b09095a] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Refactor ASCII reader to use FileReader class. Sun, 16 Apr 2017 17:24:07 GMT Paul Kienzle [b290a9e] * src/sas/sascalc/dataloader/manipulations.py (modified) fix bad indent after merge Sun, 16 Apr 2017 17:01:30 GMT Paul Kienzle [6c497b7] * .gitignore (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * check_packages.py (modified) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (modified) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/fileconverter/test/export2d.h5 (deleted) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) Merge branch 'master' into log_binning Tue, 11 Apr 2017 16:05:55 GMT krzywon [beba407] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) Start of a base file loading class and a couple unit tests for it. Tue, 11 Apr 2017 13:51:05 GMT krzywon [278ddee] * .gitattributes (modified) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * docs/sasview/Tutorial.pdf (modified) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview/__init__.py (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (added) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/fileconverter/test/export2d.h5 (deleted) * test/logging.ini (added) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/write_test.xml (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Merge branch 'master' into ticket-876 # Conflicts: # ... Mon, 10 Apr 2017 15:03:10 GMT Adam Washington [149b8f6] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Better pep8 in sesans_reader Mon, 10 Apr 2017 15:01:14 GMT Adam Washington [8938502] * check_packages.py (modified) * sasview/local_config.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge branch 'master' of github.com:SasView/sasview Sun, 09 Apr 2017 10:11:31 GMT andyfaff [7432acb] * sasview/welcome_panel.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) MAINT: search+replace '!= None' by 'is not None' Sun, 09 Apr 2017 09:46:10 GMT andyfaff [235f514] * check_packages.py (modified) * sasview/setup_mac.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: replace '== None' by 'is None' Sun, 09 Apr 2017 09:38:18 GMT krzywon [527a190] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) Loading XML files saved through no longer throwing errors. see #938 Sun, 09 Apr 2017 09:35:47 GMT Adam Washington [f6c2555] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Pass flake8 and pylint in sesans_reader.py Sun, 09 Apr 2017 09:33:25 GMT Adam Washington [1550ee0] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) Remove inaccurate comment Sun, 09 Apr 2017 09:31:32 GMT Adam Washington [35cf5c0] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Test that SASView complains if SES columns do not match headers Sun, 09 Apr 2017 09:24:21 GMT Adam Washington [e801a4e] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Test that SESANS files insist on proper headers Sun, 09 Apr 2017 09:13:18 GMT Adam Washington [a81af92] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Reject time travelling SESANS files Sun, 09 Apr 2017 09:09:13 GMT Adam Washington [f344f6c] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Throw exception if SES file has not version data Sun, 09 Apr 2017 09:08:48 GMT Adam Washington [5ae40e7] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/utest_sesans.py (modified) Throw an exception if sesans file has conflicting units We've decided ... Sun, 09 Apr 2017 09:00:29 GMT Adam Washington [10ab40e] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) Throw an exception if sesans file is missing necessary units Sun, 09 Apr 2017 08:03:36 GMT Adam Washington [4d465e3] * .gitattributes (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/media/README.txt (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/utest_sesans.py (added) Merge branch 'master' of github.com:SasView/sasview Sat, 08 Apr 2017 12:47:39 GMT Ricardo Ferraz Leal [c0ca2e3d] * .gitattributes (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * run.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) After merging conflict with master CR/LF