Changes in sasmodels/models/core_shell_ellipsoid.py [8e68ea0:7c2935c] in sasmodels

File:

• sasmodels/models/core_shell_ellipsoid.py (modified) (4 diffs)

sasmodels/models/core_shell_ellipsoid.py

@@ -137 +137 @@
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["lib/sas_3j1x_x.c", "lib/gfn.c", "lib/gauss76.c",
+source = ["lib/sph_j1c.c", "lib/gfn.c", "lib/gauss76.c",
           "core_shell_ellipsoid.c"]
 
@@ -162 +162 @@
 
 q = 0.1
-phi = pi/6
-qx = q*cos(phi)
-qy = q*sin(phi)
-# After redefinition of angles find new reasonable values for unit test
+# tests had in old coords theta=0, phi=0; new coords theta=90, phi=0
+qx = q*cos(pi/6.0)
+qy = q*sin(pi/6.0)
+# 11Jan2017 RKH sorted tests after redefinition of angles
 tests = [
      # Accuracy tests based on content in test/utest_coreshellellipsoidXTmodel.py
@@ -193 +193 @@
      }, 0.01, 8688.53],
 
-    [{'background': 0.001}, (0.4, 0.5), 0.00690673],
+   # 2D tests
+   [{'background': 0.001,
+     'theta': 90.0,
+     'phi': 0.0,
+     }, (0.4, 0.5), 0.00690673],
 
    [{'radius_equat_core': 20.0,
@@ -204 +208 @@
       'background': 0.01,
       'scale': 0.01,
-# assuming theta and phi zero here?
+      'theta': 90.0,
+      'phi': 0.0,
      }, (qx, qy), 0.01000025],
     ]