Changeset fc3ae1b in sasmodels

Timestamp:

Feb 28, 2018 2:40:48 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

5bc373b, a22d104, f549e37

Parents:

362a66f

Message:

elliptical bicelle: change description of x_core to r_major/r_minor

Location:

sasmodels/models

Files:

• core_shell_bicelle_elliptical.py (modified) (5 diffs)
• core_shell_bicelle_elliptical_belt_rough.py (modified) (2 diffs)

sasmodels/models/core_shell_bicelle_elliptical.py

@@ -9 +9 @@
 scattering length densities. The form factor is normalized by the total
 particle volume.
-
 
 .. figure:: img/core_shell_bicelle_geometry.png
@@ -91 +90 @@
 for further information.
 
-
 .. figure:: img/elliptical_cylinder_angle_definition.png
 
     Definition of the angles for the oriented core_shell_bicelle_elliptical particles.
 
-
+Model verified using Monte Carlo simulation for 1D and 2D scattering.
 
 References
@@ -108 +106 @@
 * **Author:** Richard Heenan **Date:** December 14, 2016
 * **Last Modified by:**  Richard Heenan **Date:** December 14, 2016
-* **Last Reviewed by:**  Richard Heenan BEWARE 2d data yet to be checked **Date:** December 14, 2016
+* **Last Reviewed by:**  Paul Kienzle **Date:** Feb 28, 2018
 """
 
@@ -130 +128 @@
 #             ["name", "units", default, [lower, upper], "type", "description"],
 parameters = [
-    ["radius",         "Ang",       30, [0, inf],    "volume",      "Cylinder core radius"],
-    ["x_core",        "None",       3,  [0, inf],    "volume",      "axial ratio of core, X = r_polar/r_equatorial"],
+    ["radius",         "Ang",       30, [0, inf],    "volume",      "Cylinder core radius r_minor"],
+    ["x_core",        "None",       3,  [0, inf],    "volume",      "Axial ratio of core, X = r_major/r_minor"],
     ["thick_rim",  "Ang",            8, [0, inf],    "volume",      "Rim shell thickness"],
     ["thick_face", "Ang",           14, [0, inf],    "volume",      "Cylinder face thickness"],
@@ -139 +137 @@
     ["sld_rim",        "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Cylinder rim scattering length density"],
     ["sld_solvent",    "1e-6/Ang^2", 6, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["theta",       "degrees",    90.0, [-360, 360], "orientation", "cylinder axis to beam angle"],
-    ["phi",         "degrees",    0,    [-360, 360], "orientation", "rotation about beam"],
-    ["psi",         "degrees",    0,    [-360, 360], "orientation", "rotation about cylinder axis"]
+    ["theta",       "degrees",    90.0, [-360, 360], "orientation", "Cylinder axis to beam angle"],
+    ["phi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about beam"],
+    ["psi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about cylinder axis"]
     ]
 

sasmodels/models/core_shell_bicelle_elliptical_belt_rough.py

@@ -140 +140 @@
 #             ["name", "units", default, [lower, upper], "type", "description"],
 parameters = [
-    ["radius",         "Ang",       30, [0, inf],    "volume",      "Cylinder core radius"],
-    ["x_core",        "None",       3,  [0, inf],    "volume",      "axial ratio of core, X = r_polar/r_equatorial"],
+    ["radius",         "Ang",       30, [0, inf],    "volume",      "Cylinder core radius r_minor"],
+    ["x_core",        "None",       3,  [0, inf],    "volume",      "Axial ratio of core, X = r_major/r_minor"],
     ["thick_rim",  "Ang",            8, [0, inf],    "volume",      "Rim or belt shell thickness"],
     ["thick_face", "Ang",           14, [0, inf],    "volume",      "Cylinder face thickness"],
@@ -149 +149 @@
     ["sld_rim",        "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Cylinder rim scattering length density"],
     ["sld_solvent",    "1e-6/Ang^2", 6, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["sigma",       "Ang",        0,    [0, inf],    "",            "interfacial roughness"],
-    ["theta",       "degrees",    90.0, [-360, 360], "orientation", "cylinder axis to beam angle"],
-    ["phi",         "degrees",    0,    [-360, 360], "orientation", "rotation about beam"],
-    ["psi",         "degrees",    0,    [-360, 360], "orientation", "rotation about cylinder axis"],
+    ["sigma",       "Ang",        0,    [0, inf],    "",            "Interfacial roughness"],
+    ["theta",       "degrees",    90.0, [-360, 360], "orientation", "Cylinder axis to beam angle"],
+    ["phi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about beam"],
+    ["psi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about cylinder axis"],
     ]