Changeset 3fd0499 in sasmodels for sasmodels/models/parallelepiped.py

Timestamp:

Apr 8, 2017 2:32:39 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:

afd4692, 3a45c2c

Parents:

16a8c63 (diff), b2921d0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-890

File:

• sasmodels/models/parallelepiped.py (modified) (3 diffs)

sasmodels/models/parallelepiped.py

@@ -24 +24 @@
    The edge of the solid used to have to satisfy the condition that $A < B < C$.
    After some improvements to the effective radius calculation, used with an S(Q),
-   it is beleived that this is no longer the case. 
+   it is beleived that this is no longer the case.
 
 The 1D scattering intensity $I(q)$ is calculated as:
@@ -189 +189 @@
             mu = q*B
         V: Volume of the rectangular parallelepiped
-        alpha: angle between the long axis of the 
+        alpha: angle between the long axis of the
             parallelepiped and the q-vector for 1D
 """
@@ -219 +219 @@
     Return effective radius (ER) for P(q)*S(q)
     """
-    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller 
+    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller
     # or much larger
     abc = np.vstack((length_a, length_b, length_c))