Changeset 50ec515 in sasmodels for sasmodels/models/spherical_sld.py

Timestamp:

Aug 5, 2016 8:35:30 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

e187b25

Parents:

e7fe459

Message:

spherical sld: document interface shape number→interface relationship since UI doesn't show dropdown list yet

File:

• sasmodels/models/spherical_sld.py (modified) (3 diffs)

sasmodels/models/spherical_sld.py

@@ -15 +15 @@
 sub-shell is described by a line function, with *n_steps* sub-shells per
 interface. The form factor is normalized by the total volume of the sphere.
+
+Interface shapes are as follows::
+
+    0: erf(|nu|*z)
+    1: Rpow(z^|nu|)
+    2: Lpow(z^|nu|)
+    3: Rexp(-|nu|z)
+    4: Lexp(-|nu|z)
 
 Definition
@@ -186 +194 @@
 category = "shape:sphere"
 
-SHAPES = ["erf(|nu|*z)", "Rpow(z^|nu|)", "Lpow(z^|nu|)",
-          "Rexp(-|nu|z)", "Lexp(-|nu|z)"],
+SHAPES = [["erf(|nu|*z)", "Rpow(z^|nu|)", "Lpow(z^|nu|)",
+           "Rexp(-|nu|z)", "Lexp(-|nu|z)"]]
 
 # pylint: disable=bad-whitespace, line-too-long
@@ -234 +242 @@
         sld_l = sld[i]
         sld_r = sld[i+1] if i < n_shells-1 else sld_solvent
-        interface = SHAPE_FUNCTIONS[int(np.clip(shape[i], 0, len(SHAPES)-1))]
+        fn = SHAPE_FUNCTIONS[int(np.clip(shape[i], 0, len(SHAPE_FUNCTIONS)-1))]
         for step in range(1, n_steps+1):
-            portion = interface(float(step)/n_steps, max(abs(nu[i]), 1e-14))
+            portion = fn(float(step)/n_steps, max(abs(nu[i]), 1e-14))
             z0 += dz
             z.append(z0)