Changes in / [b080ba8:c81f9b6] in sasview

Files:

• src/sas/models/qsmearing.py (deleted)
• src/sas/models/resolution.py (deleted)
• src/sas/models/smearing_2d.py (deleted)
• src/sas/sascalc/data_util/qsmearing.py (added)
• src/sas/sascalc/data_util/resolution.py (added)
• src/sas/sascalc/data_util/smearing_2d.py (added)
• src/sas/sascalc/fit/AbstractFitEngine.py (modified) (1 diff)
• src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) (1 diff)
• test/sasdataloader/test/CMSphere5.txt (added)
• test/sasdataloader/test/CMSphere5smearsphere.txt (added)
• test/sasdataloader/test/utest_smearing.py (added)
• test/sasfit/test/batch_fit.py (modified) (1 diff)
• test/sasfit/test/utest_fit_smeared.py (modified) (1 diff)
• test/sasmodels/test/CMSphere5.txt (deleted)
• test/sasmodels/test/CMSphere5smearsphere.txt (deleted)
• test/sasmodels/test/utest_smearing.py (deleted)

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -140 +140 @@
             do the following: ::
             
-                from sas.models.qsmearing import smear_selection
+                from sas.sascalc.data_util.qsmearing import smear_selection
                 smearer = smear_selection(some_data)
                 fitdata1d = FitData1D( x= [1,3,..,],

src/sas/sascalc/pr/fit/AbstractFitEngine.py

@@ -140 +140 @@
             do the following: ::
             
-                from sas.models.qsmearing import smear_selection
+                from sas.sascalc.data_util.qsmearing import smear_selection
                 smearer = smear_selection(some_data)
                 fitdata1d = FitData1D( x= [1,3,..,],

src/sas/sasgui/perspectives/fitting/batchfitpage.py

@@ -15 +15 @@
 
 from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from sas.sasgui.perspectives.fitting.fitpage import FitPage
 from sas.sasgui.perspectives.fitting.fitpage import check_data_validity

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -26 +26 @@
 from sas.sasgui.perspectives.fitting.basepage import BasicPage as BasicPage
 from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent as PageInfoEvent
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from .basepage import ModelTextCtrl
 

src/sas/sasgui/perspectives/fitting/fitproblem.py

@@ -14 +14 @@
 ################################################################################
 import copy
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 
 class FitProblemComponent(object):

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