Changeset ef476e6 in sasmodels


Ignore:
Timestamp:
Mar 29, 2019 9:06:26 AM (6 months ago)
Author:
smk78
Branches:
master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
Children:
627b68b
Parents:
abe4255
Message:

Revert some of the changes done for #1059 committed yesterday

Location:
sasmodels
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • sasmodels/conversion_table.py

    rdb1d9d5 ref476e6  
    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

    rdb1d9d5 ref476e6  
    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/unified_power_Rg.py

    r7a5f8af ref476e6  
    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 = """ 
Note: See TracChangeset for help on using the changeset viewer.