Changeset 850788e in sasmodels

Timestamp:

Mar 28, 2019 8:46:05 AM (5 years ago)

Author:

ajj

Branches:

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

Children:

c11d09f

Parents:

708bc7a (diff), fa8e6dc (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' of ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• conversion_table.py (modified) (1 diff)
• convert.py (modified) (1 diff)
• models/guinier_porod.py (modified) (1 diff)
• models/unified_power_rg.py (moved) (moved from sasmodels/models/unified_power_Rg.py) (2 diffs)
• models/pearl_necklace.py (modified) (2 diffs)

sasmodels/conversion_table.py

@@ -854 +854 @@
             "TwoPowerLawModel",
         ],
-        "unified_power_Rg": [
+        "unified_power_rg": [
             "UnifiedPowerRg",
             dict(((field_new+str(index), field_old+str(index))

sasmodels/convert.py

@@ -606 +606 @@
             if pars['volfraction_a'] > 0.5:
                 pars['volfraction_a'] = 1.0 - pars['volfraction_a']
-        elif name == 'unified_power_Rg':
+        elif name == 'unified_power_rg':
             pars['level'] = int(pars['level'])
 

sasmodels/models/guinier_porod.py

@@ -5 +5 @@
 such as rods or platelets, and shapes intermediate between spheres
 and rods or between rods and platelets, and overcomes some of the
-deficiencies of the (Beaucage) Unified_Power_Rg model (see Hammouda, 2010).
+deficiencies of the (Beaucage) :ref:`unified_power_rg` model (see Hammouda, 2010).
 
 Definition

sasmodels/models/unified_power_rg.py

@@ -70 +70 @@
 ------
 
-`unified_power_Rg.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/unified_power_Rg.py>`_
+`unified_power_rg.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/unified_power_rg.py>`_
 
 Authorship and Verification
@@ -88 +88 @@
 
 category = "shape-independent"
-name = "unified_power_Rg"
+name = "unified_power_rg"
 title = "Unified Power Rg"
 description = """

sasmodels/models/pearl_necklace.py

@@ -25 +25 @@
 .. math::
 
-    S_{ss}(q) &= sm_s^2\psi^2(q)[\frac{N}{1-sin(qA)/qA}-\frac{N}{2}-
-        \frac{1-(sin(qA)/qA)^N}{(1-sin(qA)/qA)^2}\cdot\frac{sin(qA)}{qA}] \\
-    S_{ff}(q) &= sm_r^2[M\{2\Lambda(q)-(\frac{sin(ql/2)}{ql/2})\}+
+    S_{ss}(q) &= 2m_s^2\psi^2(q)\left[\frac{N}{1-sin(qA)/qA}-\frac{N}{2}-
+        \frac{1-(sin(qA)/qA)^N}{(1-sin(qA)/qA)^2}\cdot\frac{sin(qA)}{qA}\right] \\
+    S_{ff}(q) &= m_r^2\left[M\left\{2\Lambda(q)-\left(\frac{sin(ql/2)}{ql/2}\right)\right\}+
         \frac{2M\beta^2(q)}{1-sin(qA)/qA}-2\beta^2(q)\cdot
-        \frac{1-(sin(qA)/qA)^M}{(1-sin(qA)/qA)^2}] \\
-    S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4[
+        \frac{1-(sin(qA)/qA)^M}{(1-sin(qA)/qA)^2}\right] \\
+    S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4\left[
         \frac{N-1}{1-sin(qA)/qA}-\frac{1-(sin(qA)/qA)^{N-1}}{(1-sin(qA)/qA)^2}
-        \cdot \frac{sin(qA)}{qA}] \\
+        \cdot \frac{sin(qA)}{qA}\right] \\
     \psi(q) &= 3 \cdot \frac{sin(qR)-(qR)\cdot cos(qR)}{(qR)^3} \\
     \Lambda(q) &= \frac{\int_0^{ql}\frac{sin(t)}{t}dt}{ql} \\
@@ -65 +65 @@
 ----------------------------
 
-* **Author:** 
-* **Last Modified by:** 
-* **Last Reviewed by:** 
+* **Author:**
+* **Last Modified by:**
+* **Last Reviewed by:**
 * **Source added by :** Steve King **Date:** March 25, 2019
 """