Changeset 670eee4 in sasmodels for sasmodels/compare.py


Ignore:
Timestamp:
Mar 21, 2016 10:38:23 AM (8 years ago)
Author:
krzywon
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
3a45c2c
Parents:
1671636 (diff), 9217ef8 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/compare.py

    r98d6cfc r1671636  
    366366        composition_type, parts = model_info['composition'] 
    367367        if composition_type == 'product': 
    368             from sas.models.MultiplicationModel import MultiplicationModel 
     368            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel 
    369369            P, S = [get_model(p) for p in model_info['oldname']] 
    370370            model = MultiplicationModel(P, S) 
Note: See TracChangeset for help on using the changeset viewer.