Changeset c81f9b6 in sasview

Timestamp:

Mar 18, 2016 6:00:26 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

66f21cd

Parents:

fc18690 (diff), b080ba8 (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

Files:

• src/sas/sasgui/guiframe/dummyapp.py (modified) (1 diff)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (1 diff)
• src/sas/sascalc/data_util/qsmearing.py (moved) (moved from src/sas/models/qsmearing.py) (1 diff, 1 prop)
• src/sas/sascalc/data_util/resolution.py (moved) (moved from src/sas/models/resolution.py) (1 prop)
• src/sas/sascalc/data_util/smearing_2d.py (moved) (moved from src/sas/models/smearing_2d.py) (1 prop)
• 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 (moved) (moved from test/sasmodels/test/CMSphere5.txt)
• test/sasdataloader/test/CMSphere5smearsphere.txt (moved) (moved from test/sasmodels/test/CMSphere5smearsphere.txt)
• test/sasdataloader/test/utest_smearing.py (moved) (moved from test/sasmodels/test/utest_smearing.py) (1 diff)
• test/sasfit/test/batch_fit.py (modified) (1 diff)
• test/sasfit/test/utest_fit_smeared.py (modified) (1 diff)

src/sas/sasgui/guiframe/dummyapp.py

@@ -7 +7 @@
 from sas.sasgui.guiframe.plugin_base import PluginBase
 
-class DummyView(gui_manager.ViewApp):
+class DummyView(gui_manager.SasViewApp):
     """
     """

src/sas/sasgui/guiframe/gui_manager.py

@@ -3480 +3480 @@
 
 if __name__ == "__main__":
-    app = ViewApp(0)
+    app = SasViewApp(0)
     app.MainLoop()

src/sas/sascalc/data_util/qsmearing.py

@@ -14 +14 @@
 import sys
 import sas.models.sas_extension.smearer as smearer
-from sas.models.smearing_2d import Smearer2D
+from sas.sascalc.data_util.smearing_2d import Smearer2D
 
 def smear_selection(data1D, model = None):

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/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