Changeset 8c9ffde in sasview for test/sasmodels/test/utest_dispersity.py

Timestamp:

Feb 13, 2015 2:01:33 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:

35ec279

Parents:

3a39c2e

Message:

Found more folders with the name sans and about 50% done converting
all test files.

File:

• test/sasmodels/test/utest_dispersity.py (moved) (moved from test/sansmodels/test/utest_dispersity.py) (26 diffs)

test/sasmodels/test/utest_dispersity.py

@@ -4 +4 @@
 """
 
-#Note: The 'sans.models.DisperseModel' is for only the test. We use 
-#'sans.models.dispersion_models', instead in the application.
+#Note: The 'sas.models.DisperseModel' is for only the test. We use 
+#'sas.models.dispersion_models', instead in the application.
 #The first uses width = sigma, while the second uses width = ratio (=sigma/mean)
 #for length parameters and width = sigma for angle parameters.
@@ -19 +19 @@
     """
     def setUp(self):
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         self.model= CylinderModel()
         
@@ -36 +36 @@
         
     def test_constant(self):
-        from sans.models.dispersion_models import DispersionModel
+        from sas.models.dispersion_models import DispersionModel
         disp = DispersionModel()
         self.model.setParam('scale', 10.0)
@@ -49 +49 @@
         
     def test_gaussian(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp = GaussianDispersion()
         self.model.set_dispersion('radius', disp)
@@ -63 +63 @@
         
     def test_clone(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp = GaussianDispersion()
         self.model.set_dispersion('radius', disp)
@@ -78 +78 @@
         
     def test_gaussian_zero(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp = GaussianDispersion()
         self.model.set_dispersion('radius', disp)
@@ -94 +94 @@
             compare to 1D
         """
-        from sans.models.dispersion_models import ArrayDispersion
+        from sas.models.dispersion_models import ArrayDispersion
         disp_ph = ArrayDispersion()
         disp_th = ArrayDispersion()
@@ -122 +122 @@
     """
     def setUp(self):
-        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
+        from sas.models.CoreShellCylinderModel import CoreShellCylinderModel
         self.model= CoreShellCylinderModel()
         
@@ -150 +150 @@
             Test with dispersion
         """
-        from sans.models.DisperseModel import DisperseModel
+        from sas.models.DisperseModel import DisperseModel
         disp = DisperseModel(self.model, ['radius', 
                                           'thickness', 
@@ -159 +159 @@
 
     def test_new_disp(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp_rm = GaussianDispersion()
         self.model.set_dispersion('radius', disp_rm)
@@ -189 +189 @@
             compare to 1D
         """
-        from sans.models.dispersion_models import ArrayDispersion
+        from sas.models.dispersion_models import ArrayDispersion
         disp_ph = ArrayDispersion()
         disp_th = ArrayDispersion()
@@ -219 +219 @@
     """
     def setUp(self):
-        from sans.models.CoreShellModel import CoreShellModel
+        from sas.models.CoreShellModel import CoreShellModel
         self.model= CoreShellModel()
         
@@ -245 +245 @@
             Test with dispersion
         """
-        from sans.models.DisperseModel import DisperseModel
+        from sas.models.DisperseModel import DisperseModel
         disp = DisperseModel(self.model, ['radius', 'thickness'], [10, 2])
         disp.setParam('n_pts', 10)
@@ -251 +251 @@
     
     def test_new_disp(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp_rm = GaussianDispersion()
         self.model.set_dispersion('radius', disp_rm)
@@ -273 +273 @@
     """
     def setUp(self):
-        from sans.models.EllipsoidModel import EllipsoidModel
+        from sas.models.EllipsoidModel import EllipsoidModel
         self.model= EllipsoidModel()
         
@@ -300 +300 @@
             Test with dispersion
         """
-        from sans.models.DisperseModel import DisperseModel
+        from sas.models.DisperseModel import DisperseModel
         disp = DisperseModel(self.model, ['radius_a', 'radius_b'], [5, 50])
         disp.setParam('n_pts', 10)
@@ -308 +308 @@
         
     def test_new_disp(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp_rm = GaussianDispersion()
         self.model.set_dispersion('radius_a', disp_rm)
@@ -331 +331 @@
             compare to 1D
         """
-        from sans.models.dispersion_models import ArrayDispersion
+        from sas.models.dispersion_models import ArrayDispersion
         disp_ph = ArrayDispersion()
         disp_th = ArrayDispersion()
@@ -361 +361 @@
     """
     def setUp(self):
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         self.model= SphereModel()
         
@@ -384 +384 @@
             Test with dispersion
         """
-        from sans.models.DisperseModel import DisperseModel
+        from sas.models.DisperseModel import DisperseModel
         disp = DisperseModel(self.model, ['radius'], [10])
         disp.setParam('n_pts', 10)
@@ -392 +392 @@
         
     def test_new_disp(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp_rm = GaussianDispersion()
         self.model.set_dispersion('radius', disp_rm)
@@ -408 +408 @@
     """
     def setUp(self):
-        from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
+        from sas.models.EllipticalCylinderModel import EllipticalCylinderModel
         self.model= EllipticalCylinderModel()
         
@@ -437 +437 @@
             Test with dispersion
         """
-        from sans.models.DisperseModel import DisperseModel
+        from sas.models.DisperseModel import DisperseModel
         disp = DisperseModel(self.model, ['r_minor', 'r_ratio', 'length'], 
                              [5, 0.25, 50])
@@ -445 +445 @@
 
     def test_new_disp(self):
-        from sans.models.dispersion_models import GaussianDispersion
+        from sas.models.dispersion_models import GaussianDispersion
         disp_rm = GaussianDispersion()
         self.model.set_dispersion('r_minor', disp_rm)
@@ -475 +475 @@
             compare to 1D
         """
-        from sans.models.dispersion_models import ArrayDispersion
+        from sas.models.dispersion_models import ArrayDispersion
         disp_ph = ArrayDispersion()
         disp_th = ArrayDispersion()
@@ -505 +505 @@
 class TestDispModel(unittest.TestCase):
     def setUp(self):
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         self.model = CylinderModel()