Changeset 850788e in sasmodels


Ignore:
Timestamp:
Mar 28, 2019 8:46:05 AM (4 months 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:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • sasmodels/conversion_table.py

    re65c3ba rfa8e6dc  
    854854            "TwoPowerLawModel", 
    855855        ], 
    856         "unified_power_Rg": [ 
     856        "unified_power_rg": [ 
    857857            "UnifiedPowerRg", 
    858858            dict(((field_new+str(index), field_old+str(index)) 
  • sasmodels/convert.py

    rb297ba9 rfa8e6dc  
    606606            if pars['volfraction_a'] > 0.5: 
    607607                pars['volfraction_a'] = 1.0 - pars['volfraction_a'] 
    608         elif name == 'unified_power_Rg': 
     608        elif name == 'unified_power_rg': 
    609609            pars['level'] = int(pars['level']) 
    610610 
  • sasmodels/models/guinier_porod.py

    r0507e09 rfa8e6dc  
    55such as rods or platelets, and shapes intermediate between spheres 
    66and rods or between rods and platelets, and overcomes some of the 
    7 deficiencies of the (Beaucage) Unified_Power_Rg model (see Hammouda, 2010). 
     7deficiencies of the (Beaucage) :ref:`unified_power_rg` model (see Hammouda, 2010). 
    88 
    99Definition 
  • sasmodels/models/unified_power_rg.py

    r0507e09 rfa8e6dc  
    7070------ 
    7171 
    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>`_ 
    7373 
    7474Authorship and Verification 
     
    8888 
    8989category = "shape-independent" 
    90 name = "unified_power_Rg" 
     90name = "unified_power_rg" 
    9191title = "Unified Power Rg" 
    9292description = """ 
  • sasmodels/models/pearl_necklace.py

    r0507e09 r708bc7a  
    2525.. math:: 
    2626 
    27     S_{ss}(q) &= sm_s^2\psi^2(q)[\frac{N}{1-sin(qA)/qA}-\frac{N}{2}- 
    28         \frac{1-(sin(qA)/qA)^N}{(1-sin(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}{1-sin(qA)/qA}-\frac{N}{2}- 
     28        \frac{1-(sin(qA)/qA)^N}{(1-sin(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\}+ 
    3030        \frac{2M\beta^2(q)}{1-sin(qA)/qA}-2\beta^2(q)\cdot 
    31         \frac{1-(sin(qA)/qA)^M}{(1-sin(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}{(1-sin(qA)/qA)^2}\right] \\ 
     32    S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4\left[ 
    3333        \frac{N-1}{1-sin(qA)/qA}-\frac{1-(sin(qA)/qA)^{N-1}}{(1-sin(qA)/qA)^2} 
    34         \cdot \frac{sin(qA)}{qA}] \\ 
     34        \cdot \frac{sin(qA)}{qA}\right] \\ 
    3535    \psi(q) &= 3 \cdot \frac{sin(qR)-(qR)\cdot cos(qR)}{(qR)^3} \\ 
    3636    \Lambda(q) &= \frac{\int_0^{ql}\frac{sin(t)}{t}dt}{ql} \\ 
     
    6565---------------------------- 
    6666 
    67 * **Author:**  
    68 * **Last Modified by:**  
    69 * **Last Reviewed by:**  
     67* **Author:** 
     68* **Last Modified by:** 
     69* **Last Reviewed by:** 
    7070* **Source added by :** Steve King **Date:** March 25, 2019 
    7171""" 
Note: See TracChangeset for help on using the changeset viewer.