Changeset c6ca41e in sasmodels

Timestamp:

Mar 21, 2016 8:37:48 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:

e5ce788

Parents:

95441ff

Message:

fix name of old multishell model to multilayer vesicle as agreed. Also
fixed parameters to match new agreements. reran tests

Location:

sasmodels

Files:

• 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/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