Changes in sasmodels/models/pringle.py [40a87fa:5fd684d] in sasmodels

File:

• sasmodels/models/pringle.py (modified) (6 diffs)

sasmodels/models/pringle.py

@@ -17 +17 @@
 .. math::
 
-    C_n = \int^{R}_{0} r dr\cos(qr^2\alpha \cos{\psi})
+    C_n = \frac{1}{r^2}\int^{R}_{0} r dr\cos(qr^2\alpha \cos{\psi})
     J_n\left( qr^2\beta \cos{\psi}\right)
     J_{2n}\left( qr \sin{\psi}\right)
@@ -23 +23 @@
 .. math::
 
-    S_n = \int^{R}_{0} r dr\sin(qr^2\alpha \cos{\psi})
+    S_n = \frac{1}{r^2}\int^{R}_{0} r dr\sin(qr^2\alpha \cos{\psi})
     J_n\left( qr^2\beta \cos{\psi}\right)
     J_{2n}\left( qr \sin{\psi}\right)
@@ -47 +47 @@
 **Last Modified by:** Wojciech Wpotrzebowski **on:** March 20, 2016
 
-**Last Reviewed by:** Paul Butler **on:** March 21, 2016
+**Last Reviewed by:** Andrew Jackson **on:** September 26, 2016
 
 """
@@ -102 +102 @@
       'sld_pringle': 1.0,
       'sld_solvent': 6.3,
-      'background': 6.3,
-     }, 0.1, 16.185532],
+      'background': 0.001,
+     }, 0.1, 9.87676],
 
     [{'scale' : 1.0,
@@ -112 +112 @@
       'sld_pringle': 1.0,
       'sld_solvent': 6.3,
-      'background': 6.3,
-     }, 0.01, 297.153496],
+      'background': 0.001,
+     }, 0.01, 290.56723],
 
     [{'scale' : 1.0,
@@ -122 +122 @@
       'sld_pringle': 1.0,
       'sld_solvent': 6.3,
-      'background': 6.3,
-     }, 0.001, 324.021256415],
-
-    [{'scale' : 1.0,
-      'radius': 60.0,
-      'thickness': 10.0,
-      'alpha': 0.001,
-      'beta': 0.02,
-      'sld_pringle': 1.0,
-      'sld_solvent': 6.3,
-      'background': 6.3,
-     }, (0.001, 90.0), 6.30000026876],
+      'background': 0.001,
+     }, 0.001, 317.40847],
 ]