Changeset 40c9825 in sasmodels

Timestamp:

Mar 26, 2019 1:38:18 PM (6 years ago)

Author:

smk78

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

db1c84b

Parents:

674e209

Message:

Added wrl_cyl.c to source links

Location:

sasmodels/models

Files:

• flexible_cylinder.py (modified) (3 diffs)
• flexible_cylinder_elliptical.py (modified) (3 diffs)

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 
@@ -61 +80 @@
 `flexible_cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/flexible_cylinder.c>`_
 
+`wrc_cyl.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lib/wrc_cyl.c>`_
+
 Authorship and Verification
 ----------------------------
@@ -66 +87 @@
 * **Author:** 
 * **Last Modified by:** 
-* **Last Reviewed by:** 
+* **Last Reviewed by:** Steve King **Date:** March 26, 2019
 * **Source added by :** Steve King **Date:** March 25, 2019
 """

sasmodels/models/flexible_cylinder_elliptical.py

@@ -37 +37 @@
 
     There are several typos in the original reference that have been corrected
-    by WRC. Details of the corrections are in the reference below. Most notably
+    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)$
@@ -90 +90 @@
 `flexible_cylinder_elliptical.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/flexible_cylinder_elliptical.c>`_
 
+`wrc_cyl.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lib/wrc_cyl.c>`_
+
 Authorship and Verification
 ----------------------------
@@ -95 +97 @@
 * **Author:** 
 * **Last Modified by:** Richard Heenan **Date:** December, 2016
-* **Last Reviewed by:** 
+* **Last Reviewed by:** Steve King **Date:** March 26, 2019
 * **Source added by :** Steve King **Date:** March 25, 2019
 """