Changeset 46ed760 in sasmodels for sasmodels/models

Timestamp:

Jul 17, 2016 10:41:13 PM (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:

256dfe1

Parents:

f3bd37f

Message:

enable multiplicity models, though they are not yet correct

Location:

sasmodels/models

Files:

• core_multi_shell.py (moved) (moved from sasmodels/models/_core_multi_shell.py) (2 diffs)
• onion.py (moved) (moved from sasmodels/models/_onion.py)
• rpa.py (modified) (1 diff)
• spherical_sld.py (moved) (moved from sasmodels/models/_spherical_sld.py)

sasmodels/models/core_multi_shell.py

@@ -95 +95 @@
               ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "",
                "Solvent scattering length density"],
-              ["n", "", 1, [0, 10], "volume",
+              ["n", "", 1, [0, 4], "volume",
                "number of shells"],
               ["sld[n]", "1e-6/Ang^2", 1.7, [-inf, inf], "",
@@ -184 +184 @@
     return np.sum(thickness[:n], axis=0) + radius
 
-def VR(radius, n, thick_shell):
+def VR(radius, n, thickness):
     return 1.0, 1.0
 
 demo = dict(volfraction = 1.0,
-            sld = 6.4,
+            sld_core = 6.4,
             radius = 60,
             sld_solvent = 6.4,
             n = 1,
-            sld_shell = [2.0],
-            thick_shell = [10])
+            sld = [2.0],
+            thickness = [10])

sasmodels/models/rpa.py

@@ -106 +106 @@
 source = ["rpa.c"]
 
+control = "case_num"
 HIDE_NONE = set()
 HIDE_A = set("Na Phia va La Kab Kac Kad".split())