Changeset 8c9ffde in sasview for test/sasmodels/test/utest_model_calculate_ER.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_model_calculate_ER.py (moved) (moved from test/sansmodels/test/utest_model_calculate_ER.py) (15 diffs)

test/sasmodels/test/utest_model_calculate_ER.py

@@ -11 +11 @@
     
     def setUp(self):
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         self.comp = SphereModel()
         
@@ -23 +23 @@
     
     def setUp(self):
-        from sans.models.CoreShellModel import CoreShellModel
+        from sas.models.CoreShellModel import CoreShellModel
         self.comp = CoreShellModel()
         
@@ -36 +36 @@
     
     def setUp(self):
-        from sans.models.MultiShellModel import MultiShellModel
+        from sas.models.MultiShellModel import MultiShellModel
         self.comp = MultiShellModel()
         
@@ -51 +51 @@
     
     def setUp(self):
-        from sans.models.VesicleModel import VesicleModel
+        from sas.models.VesicleModel import VesicleModel
         self.comp = VesicleModel()
         
@@ -64 +64 @@
     
     def setUp(self):
-        from sans.models.CylinderModel import CylinderModel
-        from sans.models.DiamCylFunc import DiamCylFunc
+        from sas.models.CylinderModel import CylinderModel
+        from sas.models.DiamCylFunc import DiamCylFunc
         self.comp = CylinderModel()
         self.diam = DiamCylFunc()
@@ -81 +81 @@
     
     def setUp(self):
-        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
-        from sans.models.DiamCylFunc import DiamCylFunc
+        from sas.models.CoreShellCylinderModel import CoreShellCylinderModel
+        from sas.models.DiamCylFunc import DiamCylFunc
         self.comp = CoreShellCylinderModel()
         self.diam = DiamCylFunc()
@@ -99 +99 @@
     
     def setUp(self):
-        from sans.models.HollowCylinderModel import HollowCylinderModel
-        from sans.models.DiamCylFunc import DiamCylFunc
+        from sas.models.HollowCylinderModel import HollowCylinderModel
+        from sas.models.DiamCylFunc import DiamCylFunc
         self.comp = HollowCylinderModel()
         self.diam = DiamCylFunc()
@@ -116 +116 @@
     
     def setUp(self):
-        from sans.models.StackedDisksModel import StackedDisksModel
-        from sans.models.DiamCylFunc import DiamCylFunc
+        from sas.models.StackedDisksModel import StackedDisksModel
+        from sas.models.DiamCylFunc import DiamCylFunc
         self.comp = StackedDisksModel()
         self.diam = DiamCylFunc()
@@ -135 +135 @@
     
     def setUp(self):
-        from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
-        from sans.models.DiamCylFunc import DiamCylFunc
+        from sas.models.EllipticalCylinderModel import EllipticalCylinderModel
+        from sas.models.DiamCylFunc import DiamCylFunc
         self.comp = EllipticalCylinderModel()
         self.diam = DiamCylFunc()
@@ -154 +154 @@
     
     def setUp(self):
-        from sans.models.ParallelepipedModel import ParallelepipedModel
-        from sans.models.DiamCylFunc import DiamCylFunc
+        from sas.models.ParallelepipedModel import ParallelepipedModel
+        from sas.models.DiamCylFunc import DiamCylFunc
         self.comp = ParallelepipedModel()
         self.diam = DiamCylFunc()
@@ -173 +173 @@
     
     def setUp(self):
-        from sans.models.EllipsoidModel import EllipsoidModel
-        from sans.models.DiamEllipFunc import DiamEllipFunc
+        from sas.models.EllipsoidModel import EllipsoidModel
+        from sas.models.DiamEllipFunc import DiamEllipFunc
         self.comp = EllipsoidModel()
         self.diam = DiamEllipFunc()
@@ -190 +190 @@
     
     def setUp(self):
-        from sans.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel
-        from sans.models.DiamEllipFunc import DiamEllipFunc
+        from sas.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel
+        from sas.models.DiamEllipFunc import DiamEllipFunc
         self.comp = CoreShellEllipsoidModel()
         self.diam = DiamEllipFunc()
@@ -207 +207 @@
     
     def setUp(self):
-        from sans.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel
-        from sans.models.DiamEllipFunc import DiamEllipFunc
+        from sas.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel
+        from sas.models.DiamEllipFunc import DiamEllipFunc
         self.comp = TriaxialEllipsoidModel()
         self.diam = DiamEllipFunc()
@@ -226 +226 @@
     
     def setUp(self):
-        from sans.models.LamellarModel import LamellarModel
+        from sas.models.LamellarModel import LamellarModel
         self.comp = LamellarModel()
         
@@ -238 +238 @@
     
     def setUp(self):
-        from sans.models.GuinierModel import GuinierModel
+        from sas.models.GuinierModel import GuinierModel
         self.comp = GuinierModel()