Changeset 35ec279 in sasview for test/park_integration

Timestamp:

Feb 13, 2015 2:08:43 AM (9 years ago)

Author:

krzywon

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:

b9a5f0e

Parents:

8c9ffde

Message:

Completed the SANS to SAS conversion on the tests. src.sas is left.

Location:

test/park_integration/test

Files:

• batch_fit.py (modified) (2 diffs)
• utest_fit_cylinder.py (modified) (3 diffs)
• utest_fit_line.py (modified) (1 diff)
• utest_fit_smeared.py (modified) (2 diffs)
• utest_park_scipy.py (modified) (1 diff)
• utest_small_test.py (modified) (2 diffs)

test/park_integration/test/batch_fit.py

@@ -2 +2 @@
 import time
 import unittest
-from sans.dataloader.loader import Loader
-from sans.fit.Fitting import Fit
-from sans.models.CylinderModel import CylinderModel
-import sans.models.dispersion_models 
-from sans.models.qsmearing import smear_selection
+from sas.dataloader.loader import Loader
+from sas.fit.Fitting import Fit
+from sas.models.CylinderModel import CylinderModel
+import sas.models.dispersion_models 
+from sas.models.qsmearing import smear_selection
 
 NPTS = 1
@@ -33 +33 @@
         self.list_of_constraints = []
         self.list_of_mapper = []
-        self.polydisp = sans.models.dispersion_models.models
+        self.polydisp = sas.models.dispersion_models.models
         self.qmin = qmin
         self.qmax = qmin

test/park_integration/test/utest_fit_cylinder.py

@@ -6 +6 @@
 import math
 
-from sans.fit.AbstractFitEngine import Model
-from sans.fit.Fitting import Fit
-from sans.dataloader.loader import Loader
+from sas.fit.AbstractFitEngine import Model
+from sas.fit.Fitting import Fit
+from sas.dataloader.loader import Loader
 
 #@unittest.skip("")
@@ -17 +17 @@
         self.data = Loader().load("cyl_400_20.txt")
         # Create model that fitting engine understands
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         self.model  = CylinderModel()
         self.model.setParam("scale", 1.0)
@@ -70 +70 @@
     
         # Receives the type of model for the fitting
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         cyl1  = CylinderModel()
         cyl1.name = "C1"

test/park_integration/test/utest_fit_line.py

@@ -6 +6 @@
 import math
 
-from sans.fit.AbstractFitEngine import Model, FitHandler
-from sans.dataloader.loader import Loader
-from sans.fit.Fitting import Fit
-from sans.models.LineModel import LineModel
-from sans.models.Constant import Constant
+from sas.fit.AbstractFitEngine import Model, FitHandler
+from sas.dataloader.loader import Loader
+from sas.fit.Fitting import Fit
+from sas.models.LineModel import LineModel
+from sas.models.Constant import Constant
 
 class testFitModule(unittest.TestCase):

test/park_integration/test/utest_fit_smeared.py

@@ -7 +7 @@
 
 import numpy
-from sans.fit.AbstractFitEngine import Model
-from sans.fit.Fitting import Fit
-from sans.dataloader.loader import Loader
-from sans.models.qsmearing import smear_selection
-from sans.models.CylinderModel import CylinderModel
-from sans.models.SphereModel import SphereModel
+from sas.fit.AbstractFitEngine import Model
+from sas.fit.Fitting import Fit
+from sas.dataloader.loader import Loader
+from sas.models.qsmearing import smear_selection
+from sas.models.CylinderModel import CylinderModel
+from sas.models.SphereModel import SphereModel
 
 class testFitModule(unittest.TestCase):
@@ -157 +157 @@
 
         # Model: maybe there's a better way to do this.
-        # Ideally we should have to create a new model from our sans model.
+        # Ideally we should have to create a new model from our sas model.
         fitter.set_model(Model(self.sphere),1, ['radius','scale', 'background'])
         

test/park_integration/test/utest_park_scipy.py

@@ -6 +6 @@
 import math
 
-from sans.guiframe.dataFitting import Data1D 
-from sans.fit.AbstractFitEngine import Model,FitData1D
-from sans.fit.Fitting import Fit
-from sans.dataloader.loader import Loader
-from sans.models.MultiplicationModel import MultiplicationModel
-from sans.models.CylinderModel import CylinderModel
-from sans.models.SquareWellStructure import SquareWellStructure
+from sas.guiframe.dataFitting import Data1D 
+from sas.fit.AbstractFitEngine import Model,FitData1D
+from sas.fit.Fitting import Fit
+from sas.dataloader.loader import Loader
+from sas.models.MultiplicationModel import MultiplicationModel
+from sas.models.CylinderModel import CylinderModel
+from sas.models.SquareWellStructure import SquareWellStructure
 
 class testFitModule(unittest.TestCase):

test/park_integration/test/utest_small_test.py

@@ -4 +4 @@
 import unittest
 import math
-from sans.fit.Fitting import Fit
-from sans.dataloader.loader import Loader
+from sas.fit.Fitting import Fit
+from sas.dataloader.loader import Loader
 
 class testFitModule(unittest.TestCase):
@@ -16 +16 @@
         fitter = Fit('scipy')
         # Receives the type of model for the fitting
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         model  = CylinderModel()
         model.setParam('sldCyl', 1)