Changeset f173599 in sasmodels for compare.py


Ignore:
Timestamp:
Feb 18, 2015 4:07:27 AM (9 years ago)
Author:
pkienzle
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:
c97724e
Parents:
56fc97a (diff), 87fce00 (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 github.com:sasview/sasmodels

File:
1 edited

Legend:

Unmodified
Added
Removed

  • compare.py

    r373d1b6 rf173599  
    1010 
    1111from sasmodels.bumps_model import BumpsModel, plot_data, tic 
    12 from sasmodels import kernelcl, kerneldll 
     12try: from sasmodels import kernelcl 
     13except: from sasmodels import kerneldll as kernelcl 
     14from sasmodels import kerneldll 
    1315from sasmodels.convert import revert_model 
    1416 
Note: See TracChangeset for help on using the changeset viewer.