Changeset 8c9ffde in sasview for test/sasrealspace

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.

Location:

test/sasrealspace/test

Files:

• coreshell_d=0.01_Iq.txt (moved) (moved from test/sansrealspace/test/coreshell_d=0.01_Iq.txt)
• coreshell_d=0.01_Iq2D.txt (moved) (moved from test/sansrealspace/test/coreshell_d=0.01_Iq2D.txt)
• coreshell_d=0.1_Iq.txt (moved) (moved from test/sansrealspace/test/coreshell_d=0.1_Iq.txt)
• coreshell_d=0.1_Iq2D.txt (moved) (moved from test/sansrealspace/test/coreshell_d=0.1_Iq2D.txt)
• coreshell_d=10_Iq2D.txt (moved) (moved from test/sansrealspace/test/coreshell_d=10_Iq2D.txt)
• coreshell_d=20_Iq2D.txt (moved) (moved from test/sansrealspace/test/coreshell_d=20_Iq2D.txt)
• coreshell_d=5_Iq2D.txt (moved) (moved from test/sansrealspace/test/coreshell_d=5_Iq2D.txt)
• cylinder_d=0.1_Iq.txt (moved) (moved from test/sansrealspace/test/cylinder_d=0.1_Iq.txt)
• cylinder_d=0.5_Iq2D.txt (moved) (moved from test/sansrealspace/test/cylinder_d=0.5_Iq2D.txt)
• cylinder_d=1_Iq2D.txt (moved) (moved from test/sansrealspace/test/cylinder_d=1_Iq2D.txt)
• early_test.py (moved) (moved from test/sansrealspace/test/early_test.py) (4 diffs)
• ellipsoid_d=0.05_Iq.txt (moved) (moved from test/sansrealspace/test/ellipsoid_d=0.05_Iq.txt)
• ellipsoid_d=0.5_Iq2D.txt (moved) (moved from test/sansrealspace/test/ellipsoid_d=0.5_Iq2D.txt)
• helix_d=0.05_Iq.txt (moved) (moved from test/sansrealspace/test/helix_d=0.05_Iq.txt)
• sim_validation.py (moved) (moved from test/sansrealspace/test/sim_validation.py) (5 diffs)
• sphere_d=0.02_Iq.txt (moved) (moved from test/sansrealspace/test/sphere_d=0.02_Iq.txt)
• sphere_d=0.1_Iq.txt (moved) (moved from test/sansrealspace/test/sphere_d=0.1_Iq.txt)
• sphere_d=2_Iq2D.txt (moved) (moved from test/sansrealspace/test/sphere_d=2_Iq2D.txt)
• test-case.xml (moved) (moved from test/sansrealspace/test/test-case.xml)
• test.pdb (moved) (moved from test/sansrealspace/test/test.pdb)
• utest_oriented.py (moved) (moved from test/sansrealspace/test/utest_oriented.py) (9 diffs)
• utest_realspace.py (moved) (moved from test/sansrealspace/test/utest_realspace.py) (4 diffs)

test/sasrealspace/test/early_test.py

@@ -1 +1 @@
 
 import VolumeCanvas
-from sans.models.SphereModel import SphereModel
-from sans.models.CoreShellModel import CoreShellModel
+from sas.models.SphereModel import SphereModel
+from sas.models.CoreShellModel import CoreShellModel
 
 import math, time
@@ -171 +171 @@
 
 def test_5():
-    from sans.models.SphereModel import SphereModel
+    from sas.models.SphereModel import SphereModel
     model = VolumeCanvas.VolumeCanvas()
     
@@ -196 +196 @@
 
 def test_6():
-    from sans.models.CylinderModel import CylinderModel
+    from sas.models.CylinderModel import CylinderModel
     radius = 5
     length = 40
@@ -243 +243 @@
     
 def test_7():
-    from sans.models.CoreShellModel import CoreShellModel
+    from sas.models.CoreShellModel import CoreShellModel
     print "Testing core-shell"
     radius = 15

test/sasrealspace/test/sim_validation.py

@@ -12 +12 @@
 except:
     print "Testing installed version"
-    import sans.realspace.VolumeCanvas as VolumeCanvas
+    import sas.realspace.VolumeCanvas as VolumeCanvas
      
 class Validator:
@@ -70 +70 @@
     
     def __init__(self, radius=15, density = 0.01):
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         
         self.name = 'sphere'
@@ -96 +96 @@
     
     def __init__(self, radius=15, length=100, density = 0.01):
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         
         self.name = 'cylinder'
@@ -127 +127 @@
     
     def __init__(self, radius_a=60, radius_b=10, density = 0.01):
-        from sans.models.EllipsoidModel import EllipsoidModel
-        #from sans.models.SphereModel import SphereModel
+        from sas.models.EllipsoidModel import EllipsoidModel
+        #from sas.models.SphereModel import SphereModel
         
         self.name = 'ellipsoid'
@@ -186 +186 @@
     
     def __init__(self, radius=15, thickness=5, density = 0.01):
-        from sans.models.CoreShellModel import CoreShellModel
+        from sas.models.CoreShellModel import CoreShellModel
         
         self.name = 'coreshell'

test/sasrealspace/test/utest_oriented.py

@@ -21 +21 @@
     #testing the version that is working on
     print "Testing installed version"
-    import sans.realspace.VolumeCanvas as VolumeCanvas
+    import sas.realspace.VolumeCanvas as VolumeCanvas
  
 
@@ -31 +31 @@
             Set up canvas
         """
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         self.model = VolumeCanvas.VolumeCanvas()
     
@@ -65 +65 @@
     def setUp(self):
         """ Set up cylinder model """
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         radius = 5
         length = 40
@@ -108 +108 @@
     def setUp(self):
         """ Set up cylinder model """
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         radius = 5
         length = 40
@@ -175 +175 @@
     def setUp(self):
         """ Set up ellipsoid """
-        from sans.models.EllipsoidModel import EllipsoidModel
+        from sas.models.EllipsoidModel import EllipsoidModel
         
         radius_a = 60
@@ -249 +249 @@
     def setUp(self):
         """ Set up zero-SLD-average core-shell model """
-        from sans.models.CoreShellModel import CoreShellModel
+        from sas.models.CoreShellModel import CoreShellModel
         
         radius = 15
@@ -302 +302 @@
     def setUp(self):
         """ Set up zero-SLD-average core-shell model """
-        from sans.models.CoreShellModel import CoreShellModel
+        from sas.models.CoreShellModel import CoreShellModel
         
         radius = 15
@@ -355 +355 @@
     def setUp(self):
         """ Set up ellipsoid """
-        from sans.models.EllipsoidModel import EllipsoidModel
+        from sas.models.EllipsoidModel import EllipsoidModel
         
         radius_a = 10
@@ -439 +439 @@
     def setUp(self):
         """ Set up cylinder model """
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         radius = 5
         length = 40

test/sasrealspace/test/utest_realspace.py

@@ -21 +21 @@
     #testing the version that is working on
     print "Testing installed version"
-    import sans.realspace.VolumeCanvas as VolumeCanvas
+    import sas.realspace.VolumeCanvas as VolumeCanvas
      
 class TestRealSpaceModel(unittest.TestCase):
@@ -131 +131 @@
             the user doesnt have to do it if he doesn't need to.
         """
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         sphere = SphereModel()
         sphere.setParam('radius', 10.0)
@@ -295 +295 @@
 
     def setUp(self):
-        from sans.models.CoreShellModel import CoreShellModel
+        from sas.models.CoreShellModel import CoreShellModel
         radius = 15
         thickness = 5
@@ -355 +355 @@
         
     def testWrongOrder(self):
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         self.set_coreshell_on_canvas(1, 0)