Changeset 765d025 in sasmodels for sasmodels/models/_cylpy.py

Timestamp:

Oct 30, 2018 10:05:27 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

646eeaa

Parents:

1662ebe (diff), aa8c6e0 (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 remote-tracking branch 'upstream/beta_approx'

File:

• sasmodels/models/_cylpy.py (modified) (1 diff)

sasmodels/models/_cylpy.py

@@ -177 +177 @@
     return 1.0e-4 * square(s * form)
 
-def ER(radius, length):
-    """
-    Return equivalent radius (ER)
-    """
-    ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
-    return 0.5 * (ddd) ** (1. / 3.)
+def effective_radius(mode, radius, length):
+    mode = int(mode)
+    if mode == 1:
+        ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
+        return 0.5 * (ddd) ** (1. / 3.)
+    else:
+        return 0.
 
 def random():