← Previous Changeset
Next Changeset →

Changeset 83db1cc in sasview

Timestamp:

Sep 27, 2017 10:49:33 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50, ae2f623

Parents:

66000ae (diff), 38a1e63 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-869' into ticket-887-reorg

Files:

: 11 added
: 3 deleted
: 34 edited
: 129 moved

src/sas/sascalc/corfunc/corfunc_calculator.py (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)
.gitignore (modified) (view diffs)
build_tools/deploy.bat (modified) (view diffs)
build_tools/jenkins_linux_build.sh (modified) (view diffs)
build_tools/jenkins_osx_build.sh (modified) (view diffs)
build_tools/jenkins_win64_build.bat (modified) (view diffs)
build_tools/jenkins_win_build.bat (modified) (view diffs)
build_tools/travis_build.sh (modified) (view diffs)
docs/sphinx-docs/source/user/tutorial.rst (modified) (view diffs)
installers/MANIFEST.IN (moved) (moved from sasview/MANIFEST.IN) (view diffs)
installers/README-next-release.txt (moved) (moved from sasview/README-next-release.txt) (view diffs)
installers/README.txt (moved) (moved from sasview/README.txt) (view diffs)
installers/installer_generator.py (moved) (moved from sasview/installer_generator.py) (view diffs)
installers/license.txt (moved) (moved from sasview/license.txt) (view diffs)
installers/macholib_patch.py (added)
installers/sasview.spec (moved) (moved from sasview/sasview.spec) (view diffs)
installers/sasview_console.py (added)
installers/sasview_gui.py (added)
installers/setup.cfg (moved) (moved from sasview/setup.cfg) (view diffs)
installers/setup_exe.py (moved) (moved from sasview/setup_exe.py) (view diffs)
installers/setup_mac.py (added)
installers/version.txt (moved) (moved from sasview/version.txt) (view diffs)
run.py (modified) (view diffs)
sasview/__init__.py (deleted)
sasview/sasview.py (deleted)
sasview/setup_mac.py (deleted)
setup.py (modified) (view diffs)
src/sas/logger_config.py (moved) (moved from sasview/logger_config.py) (view diffs)
src/sas/logging.ini (moved) (moved from sasview/logging.ini) (view diffs)
src/sas/sascalc/dataloader/readers/__init__.py (modified) (view diffs)
src/sas/sasgui/__init__.py (modified) (view diffs)
src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (view diffs)
src/sas/sasgui/guiframe/__init__.py (modified) (view diffs)
src/sas/sasgui/guiframe/aboutbox.py (modified) (view diffs)
src/sas/sasgui/guiframe/acknowledgebox.py (modified) (view diffs)
src/sas/sasgui/guiframe/config.py (modified) (view diffs)
src/sas/sasgui/guiframe/customdir.py (modified) (view diffs)
src/sas/sasgui/guiframe/data_panel.py (modified) (view diffs)
src/sas/sasgui/guiframe/documentation_window.py (modified) (view diffs)
src/sas/sasgui/guiframe/gui_manager.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (view diffs)
src/sas/sasgui/guiframe/startup_configuration.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/models.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/__init__.py (modified) (view diffs)
src/sas/sasgui/plottools/__init__.py (modified) (view diffs)
src/sas/sasgui/plottools/config.py (modified) (view diffs)
src/sas/sasview/__init__.py (added)
src/sas/sasview/custom_config.py (moved) (moved from sasview/custom_config.py) (view diffs)
src/sas/sasview/images/SVwelcome.png (moved) (moved from sasview/images/SVwelcome.png) (view diffs)
src/sas/sasview/images/SVwelcome_mini.png (moved) (moved from sasview/images/SVwelcome_mini.png) (view diffs)
src/sas/sasview/images/angles.png (moved) (moved from sasview/images/angles.png) (view diffs)
src/sas/sasview/images/angles_flat.png (moved) (moved from sasview/images/angles_flat.png) (view diffs)
src/sas/sasview/images/ansto_logo.png (moved) (moved from sasview/images/ansto_logo.png) (view diffs)
src/sas/sasview/images/ball.icns (moved) (moved from sasview/images/ball.icns) (view diffs)
src/sas/sasview/images/ball.ico (moved) (moved from sasview/images/ball.ico) (view diffs)
src/sas/sasview/images/danse_logo.png (moved) (moved from sasview/images/danse_logo.png) (view diffs)
src/sas/sasview/images/dls_logo.png (moved) (moved from sasview/images/dls_logo.png) (view diffs)
src/sas/sasview/images/ess_logo.png (moved) (moved from sasview/images/ess_logo.png) (view diffs)
src/sas/sasview/images/ill_logo.png (moved) (moved from sasview/images/ill_logo.png) (view diffs)
src/sas/sasview/images/isis_logo.png (moved) (moved from sasview/images/isis_logo.png) (view diffs)
src/sas/sasview/images/nist_logo.png (moved) (moved from sasview/images/nist_logo.png) (view diffs)
src/sas/sasview/images/nsf_logo.png (moved) (moved from sasview/images/nsf_logo.png) (view diffs)
src/sas/sasview/images/ornl_logo.png (moved) (moved from sasview/images/ornl_logo.png) (view diffs)
src/sas/sasview/images/sns_logo.png (moved) (moved from sasview/images/sns_logo.png) (view diffs)
src/sas/sasview/images/tudelft_logo.png (moved) (moved from sasview/images/tudelft_logo.png) (view diffs)
src/sas/sasview/images/umd_logo.png (moved) (moved from sasview/images/umd_logo.png) (view diffs)
src/sas/sasview/images/utlogo.gif (moved) (moved from sasview/images/utlogo.gif) (view diffs)
src/sas/sasview/local_config.py (moved) (moved from sasview/local_config.py) (view diffs)
src/sas/sasview/media/README.txt (moved) (moved from sasview/media/README.txt) (view diffs)
src/sas/sasview/media/Tutorial.pdf (moved) (moved from sasview/media/Tutorial.pdf) (view diffs)
src/sas/sasview/media/getting_started_with_sasview.pdf (moved) (moved from sasview/media/getting_started_with_sasview.pdf) (view diffs)
src/sas/sasview/sasview.py (added)
src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) (moved from sasview/test/1d_data/ testdata_line1.txt) (view diffs)
src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) (moved from sasview/test/1d_data/1000A_sphere_dsm.xml) (view diffs)
src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) (moved from sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh) (view diffs)
src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) (moved from sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml) (view diffs)
src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) (moved from sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5) (view diffs)
src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) (moved from sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5) (view diffs)
src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) (moved from sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml) (view diffs)
src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) (moved from sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml) (view diffs)
src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) (moved from sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml) (view diffs)
src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) (moved from sasview/test/1d_data/APS_DND-CAT.TXT) (view diffs)
src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) (moved from sasview/test/1d_data/Anton-Paar.pdh) (view diffs)
src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) (moved from sasview/test/1d_data/CoreXY_ShellZ.txt) (view diffs)
src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) (moved from sasview/test/1d_data/ISIS_83404.TXT) (view diffs)
src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) (moved from sasview/test/1d_data/ISIS_98929.TXT) (view diffs)
src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) (moved from sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml) (view diffs)
src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) (moved from sasview/test/1d_data/P123_D2O_10_percent.xml) (view diffs)
src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) (moved from sasview/test/1d_data/P123_D2O_30_percent.xml) (view diffs)
src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) (moved from sasview/test/1d_data/P123_D2O_40_percent.xml) (view diffs)
src/sas/sasview/test/1d_data/PolySpheres.txt (moved) (moved from sasview/test/1d_data/PolySpheres.txt) (view diffs)
src/sas/sasview/test/1d_data/beam profile.DAT (moved) (moved from sasview/test/1d_data/beam profile.DAT) (view diffs)
src/sas/sasview/test/1d_data/circular_test.txt (moved) (moved from sasview/test/1d_data/circular_test.txt) (view diffs)
src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) (moved from sasview/test/1d_data/cyl_400_20.txt) (view diffs)
src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) (moved from sasview/test/1d_data/cyl_400_40.txt) (view diffs)
src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) (moved from sasview/test/1d_data/cyl_testdata.txt) (view diffs)
src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) (moved from sasview/test/1d_data/cyl_testdata1.txt) (view diffs)
src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) (moved from sasview/test/1d_data/cyl_testdata2.txt) (view diffs)
src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) (moved from sasview/test/1d_data/hSDS_D2O_0p5_percent.xml) (view diffs)
src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) (moved from sasview/test/1d_data/hSDS_D2O_2p0_percent.xml) (view diffs)
src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) (moved from sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml) (view diffs)
src/sas/sasview/test/1d_data/latex_smeared.xml (moved) (moved from sasview/test/1d_data/latex_smeared.xml) (view diffs)
src/sas/sasview/test/1d_data/rpa_igor.txt (moved) (moved from sasview/test/1d_data/rpa_igor.txt) (view diffs)
src/sas/sasview/test/1d_data/saxess_example.pdh (moved) (moved from sasview/test/1d_data/saxess_example.pdh) (view diffs)
src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) (moved from sasview/test/1d_data/sphere_60_q0_2.txt) (view diffs)
src/sas/sasview/test/1d_data/sphere_80.txt (moved) (moved from sasview/test/1d_data/sphere_80.txt) (view diffs)
src/sas/sasview/test/1d_data/testdata_line.txt (moved) (moved from sasview/test/1d_data/testdata_line.txt) (view diffs)
src/sas/sasview/test/1d_data/testdata_line3.txt (moved) (moved from sasview/test/1d_data/testdata_line3.txt) (view diffs)
src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) (moved from sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5) (view diffs)
src/sas/sasview/test/2d_data/2P_New.sans (moved) (moved from sasview/test/2d_data/2P_New.sans) (view diffs)
src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) (moved from sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat) (view diffs)
src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) (moved from sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5) (view diffs)
src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) (moved from sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5) (view diffs)
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) (moved from sasview/test/2d_data/P123_D2O_10_percent.dat) (view diffs)
src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) (moved from sasview/test/2d_data/P123_D2O_30_percent.dat) (view diffs)
src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) (moved from sasview/test/2d_data/P123_D2O_40_percent.dat) (view diffs)
src/sas/sasview/test/2d_data/P_New.sans (moved) (moved from sasview/test/2d_data/P_New.sans) (view diffs)
src/sas/sasview/test/2d_data/SILIC009.ASC (added)
src/sas/sasview/test/2d_data/SILIC010.DAT (moved) (moved from sasview/test/2d_data/SILIC010.DAT) (view diffs)
src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) (moved from sasview/test/2d_data/SILIC010_noheader.DAT) (view diffs)
src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) (moved from sasview/test/2d_data/SILIC010_noheader_3col.DAT) (view diffs)
src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) (moved from sasview/test/2d_data/exp18_14_igor_2dqxqy.dat) (view diffs)
src/sas/sasview/test/README.txt (moved) (moved from sasview/test/README.txt) (view diffs)
src/sas/sasview/test/convertible_files/APS_X.TXT (moved) (moved from sasview/test/convertible_files/APS_X.TXT) (view diffs)
src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) (moved from sasview/test/convertible_files/APS_Y.TXT) (view diffs)
src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) (moved from sasview/test/convertible_files/FIT2D_I.TXT) (view diffs)
src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) (moved from sasview/test/convertible_files/FIT2D_Q.TXT) (view diffs)
src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved) (moved from sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt) (view diffs)
src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved) (moved from sasview/test/convertible_files/YBCO_12685__ISIS2D.txt) (view diffs)
src/sas/sasview/test/convertible_files/Z83000.I1D (moved) (moved from sasview/test/convertible_files/Z83000.I1D) (view diffs)
src/sas/sasview/test/convertible_files/Z83000.QAX (moved) (moved from sasview/test/convertible_files/Z83000.QAX) (view diffs)
src/sas/sasview/test/convertible_files/Z83001.I1D (moved) (moved from sasview/test/convertible_files/Z83001.I1D) (view diffs)
src/sas/sasview/test/convertible_files/Z83001.QAX (moved) (moved from sasview/test/convertible_files/Z83001.QAX) (view diffs)
src/sas/sasview/test/convertible_files/Z83002.I1D (moved) (moved from sasview/test/convertible_files/Z83002.I1D) (view diffs)
src/sas/sasview/test/convertible_files/Z98000.I1D (moved) (moved from sasview/test/convertible_files/Z98000.I1D) (view diffs)
src/sas/sasview/test/convertible_files/Z98000.QAX (moved) (moved from sasview/test/convertible_files/Z98000.QAX) (view diffs)
src/sas/sasview/test/convertible_files/Z98001.I1D (moved) (moved from sasview/test/convertible_files/Z98001.I1D) (view diffs)
src/sas/sasview/test/convertible_files/Z98001.QAX (moved) (moved from sasview/test/convertible_files/Z98001.QAX) (view diffs)
src/sas/sasview/test/convertible_files/Z98002.I1D (moved) (moved from sasview/test/convertible_files/Z98002.I1D) (view diffs)
src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) (moved from sasview/test/coordinate_data/A_Raw_Example-1.omf) (view diffs)
src/sas/sasview/test/coordinate_data/diamond.pdb (moved) (moved from sasview/test/coordinate_data/diamond.pdb) (view diffs)
src/sas/sasview/test/coordinate_data/dna.pdb (moved) (moved from sasview/test/coordinate_data/dna.pdb) (view diffs)
src/sas/sasview/test/coordinate_data/sld_file.sld (moved) (moved from sasview/test/coordinate_data/sld_file.sld) (view diffs)
src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) (moved from sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp) (view diffs)
src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) (moved from sasview/test/image_data/ISIS_98940_greyscale_gif.gif) (view diffs)
src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) (moved from sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg) (view diffs)
src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) (moved from sasview/test/image_data/ISIS_98940_greyscale_png.png) (view diffs)
src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) (moved from sasview/test/image_data/ISIS_98940_greyscale_tif.tif) (view diffs)
src/sas/sasview/test/media/testdata_help.rst (moved) (moved from sasview/test/media/testdata_help.rst) (view diffs)
src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) (moved from sasview/test/nr_data/NR_Ni_down_state.txt) (view diffs)
src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) (moved from sasview/test/nr_data/NR_Ni_up_state.txt) (view diffs)
src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) (moved from sasview/test/other_files/dist _THETA_weights.txt) (view diffs)
src/sas/sasview/test/other_files/phi_weights.txt (moved) (moved from sasview/test/other_files/phi_weights.txt) (view diffs)
src/sas/sasview/test/other_files/radius_dist.txt (moved) (moved from sasview/test/other_files/radius_dist.txt) (view diffs)
src/sas/sasview/test/other_files/theta_weights.txt (moved) (moved from sasview/test/other_files/theta_weights.txt) (view diffs)
src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) (moved from sasview/test/save_states/constrained_fit_project.svs) (view diffs)
src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) (moved from sasview/test/save_states/fit_pr_and_invariant_project.svs) (view diffs)
src/sas/sasview/test/save_states/fitstate.fitv (moved) (moved from sasview/test/save_states/fitstate.fitv) (view diffs)
src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) (moved from sasview/test/save_states/project_multiplicative_constraint.svs) (view diffs)
src/sas/sasview/test/save_states/prstate.prv (moved) (moved from sasview/test/save_states/prstate.prv) (view diffs)
src/sas/sasview/test/save_states/test.inv (moved) (moved from sasview/test/save_states/test.inv) (view diffs)
src/sas/sasview/test/save_states/test002.inv (moved) (moved from sasview/test/save_states/test002.inv) (view diffs)
src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) (moved from sasview/test/sesans_data/sphere2micron.ses) (view diffs)
src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) (moved from sasview/test/sesans_data/sphere_isis.ses) (view diffs)
src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) (moved from sasview/test/upcoming_formats/1000A_sphere_sm.xml) (view diffs)
src/sas/sasview/welcome_panel.py (moved) (moved from sasview/welcome_panel.py) (view diffs)
src/sas/sasview/wxcruft.py (moved) (moved from sasview/wxcruft.py) (view diffs)

Note: See TracChangeset for help on using the changeset viewer.

SasView

Changeset 83db1cc in sasview

Download in other formats: