Changeset b0696e1 in sasmodels

Timestamp:

Mar 30, 2016 2:27:57 PM (9 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:

364d8f7

Parents:

27fade8

Message:

allow onion model to pass smoke tests

File:

• sasmodels/models/onion.py (modified) (2 diffs)

sasmodels/models/onion.py

@@ -290 +290 @@
 category = "shape:sphere"
 
+# TODO: n is a volume parameter that is not polydisperse
 
 #             ["name", "units", default, [lower, upper], "type","description"],
 parameters = [["core_sld", "1e-6/Ang^2", 1.0, [-inf, inf], "",
                "Core scattering length density"],
-              ["core_radius", "Ang", 200., [0, inf], "",
+              ["core_radius", "Ang", 200., [0, inf], "volume",
                "Radius of the core"],
               ["solvent_sld", "1e-6/Ang^2", 6.4, [-inf, inf], "",
@@ -367 +368 @@
 
 def ER(core_radius, n, thickness):
-    return np.sum(thickness[:n], axis=0) + core_radius
+    return np.sum(thickness[:n[0]], axis=0) + core_radius
 
 def VR(core_radius, n, thickness):
-    return 1.0
+    return 1.0, 1.0
 
 demo = {