Changeset f67f26c in sasmodels

Timestamp:

Aug 1, 2016 7:32:52 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:

4edec6f

Parents:

58210db

Message:

multilayer vesicle: shell thickness is not an sld

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• conversion_table.py (modified) (1 diff)
• models/multilayer_vesicle.py (modified) (1 diff)

sasmodels/compare.py

@@ -451 +451 @@
         # paying for parameter conversion each time to keep life simple, if not fast
         oldpars = revert_pars(model_info, pars)
+        #print("sasview pars",oldpars)
         for k, v in oldpars.items():
             name_attr = k.split('.')  # polydispersity components

sasmodels/conversion_table.py

@@ -509 +509 @@
         "MultiShellModel",
         {
+            "radius": "core_radius",
+            "sld_solvent": "core_sld",
+            "n_pairs": "n_pairs",
+            "thick_shell": "s_thickness",
             "sld": "shell_sld",
             "thick_solvent": "w_thickness",
-            "thick_shell": "s_thickness",
-            "radius": "core_radius",
-            "sld_solvent": "core_sld"
         }
     ],

sasmodels/models/multilayer_vesicle.py

@@ -74 +74 @@
     ["volfraction", "",  0.05, [0.0, 1],  "", "volume fraction of vesicles"],
     ["radius", "Ang", 60.0, [0.0, inf],  "", "Core radius of the multishell"],
-    ["thick_shell", "Ang",        10.0, [0.0, inf],  "sld", "Shell thickness"],
+    ["thick_shell", "Ang",        10.0, [0.0, inf],  "", "Shell thickness"],
     ["thick_solvent", "Ang",        10.0, [0.0, inf],  "", "Water thickness"],
     ["sld_solvent",    "1e-6/Ang^2",  6.4, [-inf, inf], "sld", "Core scattering length density"],