Changeset 58c3367 in sasmodels for sasmodels/models

Timestamp:

Sep 26, 2016 3:01:05 PM (8 years ago)

Author:

ajj

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

639042e

Parents:

52ec91e

Message:

Fixing volume normalisation and docs on pringle model.

Closes #604

Location:

sasmodels/models

Files:

• pringle.c (modified) (3 diffs)
• pringle.py (modified) (3 diffs)

sasmodels/models/pringle.c

@@ -42 +42 @@
     }
 
-    #if 1
-    // TODO: should the normalization be to R^2 or the last value, r^2
-    // the gaussian window does not go all the way from 0 to 1.
-    //radius = Gauss76Z[75] * zm + zb;
-    *Sn = zm*sumS / (r*r);
-    *Cn = zm*sumC / (r*r);
-    #else
     *Sn = zm*sumS / (radius*radius);
     *Cn = zm*sumC / (radius*radius);
-    #endif
 }
 
@@ -109 +101 @@
 double form_volume(double radius, double thickness, double alpha, double beta)
 {
-    // TODO: Normalize by form volume
-    //return M_PI*radius*radius*thickness;
-    return 1.0;
+    return M_PI*radius*radius*thickness;
 }
 
@@ -126 +116 @@
     double contrast = sld_pringle - sld_solvent;
     double volume = M_PI*radius*radius*thickness;
-    // TODO: If normalize by form volume, need an extra volume here
-    //return 1.0e-4*form * square(contrast * volume);
-    return 1.0e-4*form * square(contrast) * volume;
+    return 1.0e-4*form * square(contrast * volume);
 }

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
 
 """