Changeset 6c23131 in sasview
- Timestamp:
- Jun 16, 2015 8:49:50 AM (9 years ago)
- 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- d70a31d
- Parents:
- ef17deb (diff), d4c88e24 (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. - Files:
-
- 4 added
- 1 deleted
- 2 edited
- 39 moved
-
sasview/test/1d_data/ testdata_line1.txt (moved) (moved from sasview/test/ testdata_line1.txt) (view diffs)
-
sasview/test/1d_data/1000A_sphere_dsm.xml (moved) (moved from sasview/test/1000A_sphere_dsm.xml) (view diffs)
-
sasview/test/1d_data/A_Raw_Example-1.omf (moved) (moved from sasview/test/A_Raw_Example-1.omf) (view diffs)
-
sasview/test/1d_data/CoreXY_ShellZ.txt (moved) (moved from sasview/test/CoreXY_ShellZ.txt) (view diffs)
-
sasview/test/1d_data/PolySpheres.txt (moved) (moved from sasview/test/PolySpheres.txt) (view diffs)
-
sasview/test/1d_data/beam profile.DAT (moved) (moved from sasview/test/beam profile.DAT) (view diffs)
-
sasview/test/1d_data/circular_test.txt (moved) (moved from sasview/test/circular_test.txt) (view diffs)
-
sasview/test/1d_data/cyl_400_20.txt (moved) (moved from sasview/test/cyl_400_20.txt) (view diffs)
-
sasview/test/1d_data/cyl_400_40.txt (moved) (moved from sasview/test/cyl_400_40.txt) (view diffs)
-
sasview/test/1d_data/cyl_testdata.txt (moved) (moved from sasview/test/cyl_testdata.txt) (view diffs)
-
sasview/test/1d_data/cyl_testdata1.txt (moved) (moved from sasview/test/cyl_testdata1.txt) (view diffs)
-
sasview/test/1d_data/cyl_testdata2.txt (moved) (moved from sasview/test/cyl_testdata2.txt) (view diffs)
-
sasview/test/1d_data/dist _THETA_weights.txt (added)
-
sasview/test/1d_data/latex_smeared.xml (moved) (moved from sasview/test/latex_smeared.xml) (view diffs)
-
sasview/test/1d_data/sphere_60_q0_2.txt (moved) (moved from sasview/test/sphere_60_q0_2.txt) (view diffs)
-
sasview/test/1d_data/sphere_80.txt (moved) (moved from sasview/test/sphere_80.txt) (view diffs)
-
sasview/test/1d_data/testdata_line.txt (moved) (moved from sasview/test/testdata_line.txt) (view diffs)
-
sasview/test/1d_data/testdata_line3.txt (moved) (moved from sasview/test/testdata_line3.txt) (view diffs)
-
sasview/test/2d_data/2P_New.sans (moved) (moved from sasview/test/2P_New.sans) (view diffs)
-
sasview/test/2d_data/Dec07031.ASC (moved) (moved from sasview/test/Dec07031.ASC) (view diffs)
-
sasview/test/2d_data/HiResSAN14.ASC (moved) (moved from sasview/test/HiResSAN14.ASC) (view diffs)
-
sasview/test/2d_data/MAR07262.ASC (moved) (moved from sasview/test/MAR07262.ASC) (view diffs)
-
sasview/test/2d_data/P_New.sans (moved) (moved from sasview/test/P_New.sans) (view diffs)
-
sasview/test/2d_data/SILIC009.ASC (moved) (moved from sasview/test/SILIC009.ASC) (view diffs)
-
sasview/test/2d_data/SILIC010.DAT (moved) (moved from sasview/test/SILIC010.DAT) (view diffs)
-
sasview/test/2d_data/SILIC010_noheader.DAT (moved) (moved from sasview/test/SILIC010_noheader.DAT) (view diffs)
-
sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) (moved from sasview/test/SILIC010_noheader_3col.DAT) (view diffs)
-
sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) (moved from sasview/test/exp18_14_igor_2dqxqy.dat) (view diffs)
-
sasview/test/README.txt (added)
-
sasview/test/dist _THETA_weights.txt (deleted)
-
sasview/test/save_states/_THETA_weights.txt (moved) (moved from sasview/test/_THETA_weights.txt) (view diffs)
-
sasview/test/save_states/_phi_weights.txt (moved) (moved from sasview/test/_phi_weights.txt) (view diffs)
-
sasview/test/save_states/_radius_dist.txt (moved) (moved from sasview/test/_radius_dist.txt) (view diffs)
-
sasview/test/save_states/fitstate.fitv (moved) (moved from sasview/test/fitstate.fitv) (view diffs)
-
sasview/test/save_states/newone.svs (moved) (moved from sasview/test/newone.svs) (view diffs)
-
sasview/test/save_states/prstate.prv (moved) (moved from sasview/test/prstate.prv) (view diffs)
-
sasview/test/save_states/sld_file.sld (moved) (moved from sasview/test/sld_file.sld) (view diffs)
-
sasview/test/save_states/test.inv (moved) (moved from sasview/test/test.inv) (view diffs)
-
sasview/test/save_states/test002.inv (moved) (moved from sasview/test/test002.inv) (view diffs)
-
sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) (moved from sasview/test/1000A_sphere_sm.xml) (view diffs)
-
sasview/test/upcoming_formats/diamond.pdb (moved) (moved from sasview/test/diamond.pdb) (view diffs)
-
sasview/test/upcoming_formats/dna.pdb (moved) (moved from sasview/test/dna.pdb) (view diffs)
-
setup.py (modified) (view diffs)
-
docs/sasview/Tutorial.pdf (added)
-
docs/sasview/Tutorial.pptx (modified) (view diffs)
-
docs/sasview/Tutorial_Old.pptx (added)
Note: See TracChangeset
for help on using the changeset viewer.
