Changeset 7b15990 in sasview
- Timestamp:
- Sep 18, 2017 2:45:52 PM (8 years ago)
- Branches:
- costrafo411
- Parents:
- 9f59333 (diff), cfd27dd (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:
-
- 45 added
- 31 deleted
- 122 edited
- 4 moved
-
.gitignore (modified) (view diffs)
-
.pydevproject (modified) (view diffs)
-
README.md (modified) (view diffs)
-
Vagrantfile (modified) (view diffs)
-
Vagrantprovision.sh (modified) (view diffs)
-
check_packages.py (modified) (view diffs)
-
docs/sasview/Tutorial.pdf (modified) (view diffs)
-
docs/sasview/Tutorial.pptx (modified) (view diffs)
-
docs/sasview/Tutorial_SV2.pdf (moved) (moved from docs/sasview/Tutorial_Old.pdf) (view diffs)
-
docs/sasview/Tutorial_SV2.pptx (moved) (moved from docs/sasview/Tutorial_Old.pptx) (view diffs)
-
docs/sasview/Tutorial_SV3.pdf (added)
-
docs/sasview/Tutorial_SV3.pptx (added)
-
docs/sphinx-docs/build_sphinx.py (modified) (view diffs)
-
docs/sphinx-docs/source/user/tutorial.rst (modified) (view diffs)
-
docs/sphinx-docs/source/user/working.rst (modified) (view diffs)
-
run.py (modified) (view diffs)
-
sasview/images/dls_logo.png (moved) (moved from src/sas/sasgui/guiframe/images/dls_logo.png) (view diffs)
-
sasview/installer_generator.py (modified) (view diffs)
-
sasview/local_config.py (modified) (view diffs)
-
sasview/logger_config.py (added)
-
sasview/logging.ini (modified) (view diffs)
-
sasview/media/README.txt (modified) (view diffs)
-
sasview/media/Tutorial.pdf (modified) (view diffs)
-
sasview/media/getting_started_with_sasview.pdf (added)
-
sasview/sasview.py (modified) (view diffs)
-
sasview/setup_exe.py (modified) (view diffs)
-
sasview/setup_mac.py (modified) (view diffs)
-
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)
-
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) (view diffs)
-
sasview/test/sesans_data/sphere_isis.ses (added)
-
sasview/wxcruft.py (modified) (view diffs)
-
setup.py (modified) (view diffs)
-
src/examples/data_generator/testdata_generator.py (modified) (view diffs)
-
src/sas/sascalc/calculator/sas_gen.py (modified) (view diffs)
-
src/sas/sascalc/data_util/calcthread.py (modified) (view diffs)
-
src/sas/sascalc/data_util/formatnum.py (modified) (view diffs)
-
src/sas/sascalc/data_util/nxsunit.py (modified) (view diffs)
-
src/sas/sascalc/data_util/qsmearing.py (modified) (view diffs)
-
src/sas/sascalc/data_util/registry.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/data_info.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/file_reader_base_class.py (added)
-
src/sas/sascalc/dataloader/loader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/loader_exceptions.py (added)
-
src/sas/sascalc/dataloader/manipulations.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/IgorReader.py (deleted)
-
src/sas/sascalc/dataloader/readers/__init__.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/associations.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (view diffs)
-
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) (view diffs)
-
src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (view diffs)
-
src/sas/sascalc/dataloader/readers/xml_reader.py (modified) (view diffs)
-
src/sas/sascalc/file_converter/ascii2d_loader.py (added)
-
src/sas/sascalc/fit/AbstractFitEngine.py (modified) (view diffs)
-
src/sas/sascalc/fit/Loader.py (modified) (view diffs)
-
src/sas/sascalc/fit/expression.py (modified) (view diffs)
-
src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) (view diffs)
-
src/sas/sascalc/pr/c_extensions/invertor.c (modified) (view diffs)
-
src/sas/sascalc/pr/c_extensions/invertor.h (modified) (view diffs)
-
src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) (view diffs)
-
src/sas/sascalc/pr/fit/Loader.py (modified) (view diffs)
-
src/sas/sascalc/pr/fit/expression.py (modified) (view diffs)
-
src/sas/sascalc/pr/invertor.py (modified) (view diffs)
-
src/sas/sascalc/pr/num_term.py (modified) (view diffs)
-
src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) (view diffs)
-
src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) (view diffs)
-
src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) (view diffs)
-
src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) (view diffs)
-
src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) (view diffs)
-
src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) (view diffs)
-
src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) (view diffs)
-
src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) (view diffs)
-
src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) (view diffs)
-
src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/config.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/data_panel.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/data_processor.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/dummyapp.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/gui_manager.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/gui_style.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/images/angles.png (deleted)
-
src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
-
src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
-
src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
-
src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) (moved from src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/proxy.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/basepage.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/fitting.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
-
src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
-
src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
-
src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/model_thread.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/models.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/pr/inversion_state.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) (view diffs)
-
src/sas/sasgui/perspectives/pr/pr.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) (view diffs)
-
src/sas/sasgui/plottools/PlotPanel.py (modified) (view diffs)
-
src/sas/sasgui/plottools/binder.py (modified) (view diffs)
-
src/sas/sasgui/plottools/convert_units.py (modified) (view diffs)
-
src/sas/sasgui/plottools/fittings.py (modified) (view diffs)
-
src/sas/sasgui/plottools/plottable_interactor.py (modified) (view diffs)
-
src/sas/sasgui/plottools/plottables.py (modified) (view diffs)
-
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/cansas1d.xml (modified) (view diffs)
-
test/fileconverter/test/export2d.h5 (deleted)
-
test/fileconverter/test/utest_nxcansas_writer.py (modified) (view diffs)
-
test/pr_inversion/__init__.py (added)
-
test/pr_inversion/test/__init__.py (added)
-
test/pr_inversion/test/utest_invertor.py (modified) (view diffs)
-
test/run_one.py (modified) (view diffs)
-
test/sascalculator/__init__.py (added)
-
test/sascalculator/test/__init__.py (added)
-
test/sascalculator/test/utest_slit_length_calculator.py (modified) (view diffs)
-
test/sasdataloader/__init__.py (added)
-
test/sasdataloader/plugins/__init__.py (added)
-
test/sasdataloader/plugins/test_reader.py (modified) (view diffs)
-
test/sasdataloader/test/AR07232_rest.ASC (deleted)
-
test/sasdataloader/test/MAR07232_rest.ASC (deleted)
-
test/sasdataloader/test/MAR07232_rest.h5 (added)
-
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) (view diffs)
-
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 (deleted)
-
test/sasdataloader/test/testplugings.py (deleted)
-
test/sasdataloader/test/utest_abs_reader.py (modified) (view diffs)
-
test/sasdataloader/test/utest_ascii.py (modified) (view diffs)
-
test/sasdataloader/test/utest_averaging.py (modified) (view diffs)
-
test/sasdataloader/test/utest_cansas.py (modified) (view diffs)
-
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) (view diffs)
-
test/sasdataloader/test/utest_sesans.py (added)
-
test/sasdataloader/test/valid_cansas_xml.xml (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) (view diffs)
-
test/sasinvariant/__init__.py (added)
-
test/sasinvariant/test/__init__.py (added)
-
test/sasinvariant/test/utest_use_cases.py (modified) (view diffs)
-
test/sasrealspace/__init__.py (added)
-
test/sasrealspace/test/__init__.py (added)
-
test/sasrealspace/test/early_test.py (modified) (view diffs)
-
test/sasrealspace/test/sim_validation.py (modified) (view diffs)
-
test/sasrealspace/test/utest_oriented.py (modified) (view diffs)
-
test/sasrealspace/test/utest_realspace.py (modified) (view diffs)
-
test/utest_sasview.py (modified) (view diffs)
-
sasview/images/dls_logo.png
- Property mode changed from 100644 to 100755
Note: See TracChangeset
for help on using the changeset viewer.
