Changeset bccabbc in sasmodels

Timestamp:

Feb 19, 2015 6:09:09 AM (10 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:

dc02af0, 946cdc8e, 3a45c2c

Parents:

62b3cb2 (diff), 57cb76d (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

Location:

sasmodels

Files:

• models/bcc.py (modified) (1 diff)
• bumps_model.py (modified) (1 diff)

sasmodels/models/bcc.py

@@ -80 +80 @@
 from numpy import pi, inf
 
-name = "BCCparacrystal"
+name = "bcc_paracrystal"
 title = "Body-centred cubic lattic with paracrystalline distortion"
 description = """

sasmodels/bumps_model.py

@@ -17 +17 @@
 try:
     from .kernelcl import load_model as _loader
-except ImportError,exc:
+except RuntimeError,exc:
     import warnings
     warnings.warn(str(exc))