Changeset b2669f5 in sasview for test

Timestamp:

Mar 18, 2016 4:24:33 AM (9 years ago)

Author:

smk78

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:

fdeabcc

Parents:

6177333 (diff), c81f9b6 (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 'master' of ​https://github.com/SasView/sasview.git

Location:

test

Files:

• sasdataloader/test/CMSphere5.txt (moved) (moved from test/sasmodels/test/CMSphere5.txt)
• sasdataloader/test/CMSphere5smearsphere.txt (moved) (moved from test/sasmodels/test/CMSphere5smearsphere.txt)
• sasdataloader/test/utest_smearing.py (moved) (moved from test/sasmodels/test/utest_smearing.py) (1 diff)
• sasfit/test/batch_fit.py (modified) (1 diff)
• sasfit/test/utest_fit_smeared.py (modified) (1 diff)

test/sasdataloader/test/utest_smearing.py

@@ -9 +9 @@
 from sas.sascalc.dataloader.data_info import Data1D, Data2D
 #from DataLoader.qsmearing import SlitSmearer, QSmearer, smear_selection
-from sas.models.qsmearing import SlitSmearer, QSmearer, smear_selection
+from sas.sascalc.data_util.qsmearing import SlitSmearer, QSmearer, smear_selection
 from sas.models.SphereModel import SphereModel
 import os.path

test/sasfit/test/batch_fit.py

@@ -6 +6 @@
 from sas.models.CylinderModel import CylinderModel
 import sas.models.dispersion_models 
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 
 NPTS = 1

test/sasfit/test/utest_fit_smeared.py

@@ -10 +10 @@
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
 from sas.sascalc.dataloader.loader import Loader
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from sas.models.CylinderModel import CylinderModel
 from sas.models.SphereModel import SphereModel