Changeset 404ebbd in sasmodels for sasmodels/models/elliptical_cylinder.py

Timestamp:

Jul 30, 2017 12:56:22 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

48462b0

Parents:

a151caa

Message:

tuned random model generation for more models

File:

• sasmodels/models/elliptical_cylinder.py (modified) (5 diffs)

sasmodels/models/elliptical_cylinder.py

@@ -33 +33 @@
 
     a = qr'\sin(\alpha)
-    
+
     b = q\frac{L}{2}\cos(\alpha)
-    
+
     r'=\frac{r_{minor}}{\sqrt{2}}\sqrt{(1+\nu^{2}) + (1-\nu^{2})cos(\psi)}
 
@@ -57 +57 @@
 define the axis of the cylinder using two angles $\theta$, $\phi$ and $\Psi$
 (see :ref:`cylinder orientation <cylinder-angle-definition>`). The angle
-$\Psi$ is the rotational angle around its own long_c axis. 
+$\Psi$ is the rotational angle around its own long_c axis.
 
 All angle parameters are valid and given only for 2D calculation; ie, an
@@ -72 +72 @@
     detector plane, with $\Psi$ = 0.
 
-The $\theta$ and $\phi$ parameters to orient the cylinder only appear in the model when fitting 2d data. 
+The $\theta$ and $\phi$ parameters to orient the cylinder only appear in the model when fitting 2d data.
 On introducing "Orientational Distribution" in the angles, "distribution of theta" and "distribution of phi" parameters will
-appear. These are actually rotations about the axes $\delta_1$ and $\delta_2$ of the cylinder, the $b$ and $a$ axes of the 
-cylinder cross section. (When $\theta = \phi = 0$ these are parallel to the $Y$ and $X$ axes of the instrument.) 
-The third orientation distribution, in $\psi$, is about the $c$ axis of the particle. Some experimentation may be required to 
-understand the 2d patterns fully. (Earlier implementations had numerical integration issues in some circumstances when orientation 
-distributions passed through 90 degrees, such situations, with very broad distributions, should still be approached with care.) 
+appear. These are actually rotations about the axes $\delta_1$ and $\delta_2$ of the cylinder, the $b$ and $a$ axes of the
+cylinder cross section. (When $\theta = \phi = 0$ these are parallel to the $Y$ and $X$ axes of the instrument.)
+The third orientation distribution, in $\psi$, is about the $c$ axis of the particle. Some experimentation may be required to
+understand the 2d patterns fully. (Earlier implementations had numerical integration issues in some circumstances when orientation
+distributions passed through 90 degrees, such situations, with very broad distributions, should still be approached with care.)
 
 NB: The 2nd virial coefficient of the cylinder is calculated based on the
@@ -110 +110 @@
 
 * **Author:**
-* **Last Modified by:** 
+* **Last Modified by:**
 * **Last Reviewed by:**  Richard Heenan - corrected equation in docs **Date:** December 21, 2016
 
@@ -156 +156 @@
                            + (length + radius) * (length + pi * radius))
     return 0.5 * (ddd) ** (1. / 3.)
+
+def random():
+    import numpy as np
+    # V = pi * radius_major * radius_minor * length;
+    V = 10**np.random.uniform(3, 9)
+    length = 10**np.random.uniform(1, 3)
+    axis_ratio = 10**(4*np.random.uniform(-2, 2)
+    radius_minor = np.sqrt(V/length/axis_ratio)
+    Vf = 10**np.random.uniform(-4, -2)
+    pars = dict(
+        #background=0, sld=0, sld_solvent=1,
+        scale=1e9*Vf/V,
+        length=length,
+        radius_minor=radius_minor,
+        axis_ratio=axis_ratio,
+    )
+    return pars
+
 q = 0.1
 # april 6 2017, rkh added a 2d unit test, NOT READY YET pull #890 branch assume correct!