Changeset e56883e in sasmodels

Timestamp:

Mar 21, 2016 10:39:14 AM (9 years ago)

Author:

butler

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:

e5ce788 (diff), 670eee4 (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.git

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• convert.py (modified) (2 diffs)
• models/multi_shell.c (deleted)
• models/multi_shell.py (deleted)
• models/multilayer_vesicle.c (added)
• models/multilayer_vesicle.py (added)

sasmodels/compare.py

@@ -366 +366 @@
         composition_type, parts = model_info['composition']
         if composition_type == 'product':
-            from sas.models.MultiplicationModel import MultiplicationModel
+            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
             P, S = [get_model(p) for p in model_info['oldname']]
             model = MultiplicationModel(P, S)

sasmodels/convert.py

@@ -156 +156 @@
         elif name == 'vesicle':
             del oldpars['volfraction']
+        elif name == 'multilayer_vesicle':
+            del oldpars['volfraction']
 
     return oldpars
@@ -195 +197 @@
         elif name == 'vesicle':
             pars['volfraction'] = 1
+        elif name == 'multilayer_vesicle':
+            pars['volfraction'] = 1