Changeset 3c56da87 in sasmodels for sasmodels/models/barbell.py

Timestamp:

Mar 4, 2015 10:55:38 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:

3a45c2c

Parents:

b89f519

Message:

lint cleanup

File:

• sasmodels/models/barbell.py (modified) (6 diffs)

sasmodels/models/barbell.py

@@ -4 +4 @@
 r"""
 
-Calculates the scattering from a barbell-shaped cylinder (This model simply becomes the DumBellModel when the length of
-the cylinder, *L*, is set to zero). That is, a sphereocylinder with spherical end caps that have a radius larger than
-that of the cylinder and the center of the end cap radius lies outside of the cylinder. All dimensions of the BarBell
-are considered to be monodisperse. See the diagram for the details of the geometry and restrictions on parameter values.
+Calculates the scattering from a barbell-shaped cylinder (This model simply
+becomes the DumBellModel when the length of the cylinder, *L*, is set to zero).
+That is, a sphereocylinder with spherical end caps that have a radius larger
+than that of the cylinder and the center of the end cap radius lies outside
+of the cylinder. All dimensions of the BarBell are considered to be
+monodisperse. See the diagram for the details of the geometry and restrictions
+on parameter values.
 
 Definition
@@ -18 +21 @@
 .. image:: img/barbell_geometry.jpg
 
-where *r* is the radius of the cylinder. All other parameters are as defined in the diagram.
+where *r* is the radius of the cylinder. All other parameters are as defined
+in the diagram.
 
 Since the end cap radius
-*R* >= *r* and by definition for this geometry *h* < 0, *h* is then defined by *r* and *R* as
+*R* >= *r* and by definition for this geometry *h* < 0, *h* is then
+defined by *r* and *R* as
 
 *h* = -1 \* sqrt(*R*\ :sup:`2` - *r*\ :sup:`2`)
@@ -46 +51 @@
              \over QR\sin\theta \left(1-t^2\right)^{1/2}}
 
-The < > brackets denote an average of the structure over all orientations. <*A* :sup:`2`\ *(q)*> is then the form
-factor, *P(q)*. The scale factor is equivalent to the volume fraction of cylinders, each of volume, *V*. Contrast is
-the difference of scattering length densities of the cylinder and the surrounding solvent.
+The < > brackets denote an average of the structure over all orientations.
+<*A* :sup:`2`\ *(q)*> is then the form factor, *P(q)*. The scale factor is
+equivalent to the volume fraction of cylinders, each of volume, *V*. Contrast
+is the difference of scattering length densities of the cylinder and the
+surrounding solvent.
 
 The volume of the barbell is
@@ -69 +76 @@
         \left( 4R^3 6R^2h - 2h^3 + 3r^2L \right)^{-1}
 
-**The requirement that** *R* >= *r* **is not enforced in the model!** It is up to you to restrict this during analysis.
+**The requirement that** *R* >= *r* **is not enforced in the model!** It is
+up to you to restrict this during analysis.
 
 This example dataset is produced by running the Macro PlotBarbell(),
@@ -79 +87 @@
 *Figure. 1D plot using the default values (w/256 data point).*
 
-For 2D data: The 2D scattering intensity is calculated similar to the 2D cylinder model. For example, for
-|theta| = 45 deg and |phi| = 0 deg with default values for other parameters
+For 2D data: The 2D scattering intensity is calculated similar to the 2D
+cylinder model. For example, for |theta| = 45 deg and |phi| = 0 deg with
+default values for other parameters
 
 .. image:: img/barbell_2d.jpg
@@ -102 +111 @@
 
 """
-from numpy import pi, inf
+from numpy import inf
 
 name = "barbell"