Changeset d57b06c in sasmodels for sasmodels/models/flexible_cylinder.py

Timestamp:

Mar 30, 2019 2:06:15 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master

Children:

be0942c

Parents:

a42b091 (diff), e15a822 (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 'origin/master' into ticket-1263-source-link

File:

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

sasmodels/models/flexible_cylinder.py

@@ -41 +41 @@
     pseudocontinuous limit.
     See equations (13,26-27) in the original reference for the details.
+
+.. note::
+
+    There are several typos in the original reference that have been corrected
+    by WRC [2]. Details of the corrections are in the reference below. Most notably
+
+    - Equation (13): the term $(1 - w(QR))$ should swap position with $w(QR)$
+
+    - Equations (23) and (24) are incorrect; WRC has entered these into
+      Mathematica and solved analytically. The results were then converted to
+      code.
+
+    - Equation (27) should be $q0 = max(a3/(Rg^2)^{1/2},3)$ instead of
+      $max(a3*b(Rg^2)^{1/2},3)$
+
+    - The scattering function is negative for a range of parameter values and
+      q-values that are experimentally accessible. A correction function has been
+      added to give the proper behavior.
+
+
+**This is a model with complex behaviour depending on the ratio of** $L/b$ **and the
+reader is strongly encouraged to read reference [1] before use.**
 
 .. note::