Changeset 850788e in sasmodels
 Timestamp:
 Mar 28, 2019 8:46:05 AM (8 weeks ago)
 Branches:
 master, core_shell_microgels, magnetic_model, ticket1257vesicleproduct, 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.  Location:
 sasmodels
 Files:

 4 edited
 1 moved
Legend:
 Unmodified
 Added
 Removed

sasmodels/conversion_table.py
re65c3ba rfa8e6dc 854 854 "TwoPowerLawModel", 855 855 ], 856 "unified_power_ Rg": [856 "unified_power_rg": [ 857 857 "UnifiedPowerRg", 858 858 dict(((field_new+str(index), field_old+str(index)) 
sasmodels/convert.py
rb297ba9 rfa8e6dc 606 606 if pars['volfraction_a'] > 0.5: 607 607 pars['volfraction_a'] = 1.0  pars['volfraction_a'] 608 elif name == 'unified_power_ Rg':608 elif name == 'unified_power_rg': 609 609 pars['level'] = int(pars['level']) 610 610 
sasmodels/models/guinier_porod.py
r0507e09 rfa8e6dc 5 5 such as rods or platelets, and shapes intermediate between spheres 6 6 and rods or between rods and platelets, and overcomes some of the 7 deficiencies of the (Beaucage) Unified_Power_Rgmodel (see Hammouda, 2010).7 deficiencies of the (Beaucage) :ref:`unified_power_rg` model (see Hammouda, 2010). 8 8 9 9 Definition 
sasmodels/models/unified_power_rg.py
r0507e09 rfa8e6dc 70 70  71 71 72 `unified_power_ Rg.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/unified_power_Rg.py>`_72 `unified_power_rg.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/unified_power_rg.py>`_ 73 73 74 74 Authorship and Verification … … 88 88 89 89 category = "shapeindependent" 90 name = "unified_power_ Rg"90 name = "unified_power_rg" 91 91 title = "Unified Power Rg" 92 92 description = """ 
sasmodels/models/pearl_necklace.py
r0507e09 r708bc7a 25 25 .. math:: 26 26 27 S_{ss}(q) &= sm_s^2\psi^2(q)[\frac{N}{1sin(qA)/qA}\frac{N}{2}28 \frac{1(sin(qA)/qA)^N}{(1sin(qA)/qA)^2}\cdot\frac{sin(qA)}{qA} ] \\29 S_{ff}(q) &= sm_r^2[M\{2\Lambda(q)(\frac{sin(ql/2)}{ql/2})\}+27 S_{ss}(q) &= 2m_s^2\psi^2(q)\left[\frac{N}{1sin(qA)/qA}\frac{N}{2} 28 \frac{1(sin(qA)/qA)^N}{(1sin(qA)/qA)^2}\cdot\frac{sin(qA)}{qA}\right] \\ 29 S_{ff}(q) &= m_r^2\left[M\left\{2\Lambda(q)\left(\frac{sin(ql/2)}{ql/2}\right)\right\}+ 30 30 \frac{2M\beta^2(q)}{1sin(qA)/qA}2\beta^2(q)\cdot 31 \frac{1(sin(qA)/qA)^M}{(1sin(qA)/qA)^2} ] \\32 S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4 [31 \frac{1(sin(qA)/qA)^M}{(1sin(qA)/qA)^2}\right] \\ 32 S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4\left[ 33 33 \frac{N1}{1sin(qA)/qA}\frac{1(sin(qA)/qA)^{N1}}{(1sin(qA)/qA)^2} 34 \cdot \frac{sin(qA)}{qA} ] \\34 \cdot \frac{sin(qA)}{qA}\right] \\ 35 35 \psi(q) &= 3 \cdot \frac{sin(qR)(qR)\cdot cos(qR)}{(qR)^3} \\ 36 36 \Lambda(q) &= \frac{\int_0^{ql}\frac{sin(t)}{t}dt}{ql} \\ … … 65 65  66 66 67 * **Author:** 68 * **Last Modified by:** 69 * **Last Reviewed by:** 67 * **Author:** 68 * **Last Modified by:** 69 * **Last Reviewed by:** 70 70 * **Source added by :** Steve King **Date:** March 25, 2019 71 71 """
Note: See TracChangeset
for help on using the changeset viewer.