Changeset 2d81cfe in sasmodels for sasmodels/models/stacked_disks.py

Timestamp:

Nov 29, 2017 11:13:23 AM (6 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:

237b800f

Parents:

a839b22

Message:

lint

File:

• sasmodels/models/stacked_disks.py (modified) (8 diffs)

sasmodels/models/stacked_disks.py

@@ -10 +10 @@
 distribution. As such the normalization of this "composite" form factor is
 relative to the individual disk volume, not the volume of the stack of disks.
-This model is appropriate for example for non non exfoliated clay particles such
-as Laponite.
+This model is appropriate for example for non non exfoliated clay particles
+such as Laponite.
 
 .. figure:: img/stacked_disks_geometry.png
@@ -32 +32 @@
     \Delta \rho_i = \rho_i - \rho_\text{solvent}
 
-and $N$ is the number of individual (single) discs per unit volume, $\alpha$ is
-the angle between the axis of the disc and $q$, and $V_t$ and $V_c$ are the
+and $N$ is the number of individual (single) discs per unit volume, $\alpha$
+is the angle between the axis of the disc and $q$, and $V_t$ and $V_c$ are the
 total volume and the core volume of a single disc, respectively, and
 
@@ -110 +110 @@
 """
 
+import numpy as np
 from numpy import inf, sin, cos, pi
 
@@ -146 +147 @@
 
 def random():
-    import numpy as np
     radius = 10**np.random.uniform(1, 4.7)
     total_stack = 10**np.random.uniform(1, 4.7)
@@ -212 +212 @@
       'scale': 0.01,
       'background': 0.001,
-#     }, 0.001, 5065.12793824],    n_stacking=1 not 5 ? slight change in value here 11jan2017, check other cpu types
-#     }, 0.001, 5075.11570493],
+      # n_stacking=1 not 5 ? slight change in value here 11jan2017,
+      # check other cpu types
+      #}, 0.001, 5065.12793824],
+      #}, 0.001, 5075.11570493],
      }, 0.001, 25325.635693],
     [{'thick_core': 10.0,
@@ -240 +242 @@
       'scale': 0.01,
       'background': 0.001,
-#     }, 0.164, 0.0127673597265],    n_stacking=1 not 5 ?  slight change in value here 11jan2017, check other cpu types
-#     }, 0.164, 0.01480812968],
+      # n_stacking=1 not 5 ?  slight change in value here 11jan2017,
+      # check other cpu types
+      #}, 0.164, 0.0127673597265],
+      #}, 0.164, 0.01480812968],
      }, 0.164, 0.0598367986509],
 
@@ -256 +260 @@
       'scale': 0.01,
       'background': 0.001,
-# second test here was at q=90, changed it to q=5, note I(q) is then just value of flat background
+      # second test here was at q=90, changed it to q=5,
+      # note I(q) is then just value of flat background
      }, [0.001, 5.0], [5075.12, 0.001]],
 
@@ -272 +277 @@
       'background': 0.001,
      }, ([0.4, 0.5]), [0.00105074, 0.00121761]],
-#    [{'thick_core': 10.0,
-#      'thick_layer': 15.0,
-#      'radius': 3000.0,
-#      'n_stacking': 1.0,
-#      'sigma_d': 0.0,
-#      'sld_core': 4.0,
-#      'sld_layer': -0.4,
-#      'sld_solvent': 5.0,
-#      'theta': 90.0,
-#      'phi': 20.0,
-#      'scale': 0.01,
-#      'background': 0.001,
-# 2017-05-18 PAK temporarily suppress output of qx,qy test; j1 is not accurate for large qr
-#     }, (qx, qy), 0.0341738733124],
-#     }, (qx, qy), None],
+    #[{'thick_core': 10.0,
+    #  'thick_layer': 15.0,
+    #  'radius': 3000.0,
+    #  'n_stacking': 1.0,
+    #  'sigma_d': 0.0,
+    #  'sld_core': 4.0,
+    #  'sld_layer': -0.4,
+    #  'sld_solvent': 5.0,
+    #  'theta': 90.0,
+    #  'phi': 20.0,
+    #  'scale': 0.01,
+    #  'background': 0.001,
+    # 2017-05-18 PAK temporarily suppress output of qx,qy test; j1 is
+    #     not accurate for large qr
+    # }, (qx, qy), 0.0341738733124],
+    # }, (qx, qy), None],
 
     [{'thick_core': 10.0,