Changeset 3034fc5 in sasmodels

Timestamp:

Mar 27, 2016 9:32:52 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:

53215cf

Parents:

b274bec

Message:

added stacked_disk model's n_stacked parameter to list of parameters
that are not polydispers in SasView. Removes key error. Plot produced
by compare is however empty so still not working completely

File:

• sasmodels/convert.py (modified) (2 diffs)

sasmodels/convert.py

@@ -137 +137 @@
     namelist = name.split('*') if '*' in name else [name]
     for name in namelist:
-        if name == 'pearl_necklace':
+        if name == 'stacked_disks':
+            _remove_pd(oldpars, 'n_stacking', name)
+        elif name == 'pearl_necklace':
             _remove_pd(oldpars, 'num_pearls', name)
             _remove_pd(oldpars, 'thick_string', name)
@@ -181 +183 @@
     namelist = name.split('*') if '*' in name else [name]
     for name in namelist:
-        if name == 'pearl_necklace':
+        if name == 'stacked_disks':
+            pars['n_stacking'] = 0
+        elif name == 'pearl_necklace':
             pars['string_thickness_pd_n'] = 0
             pars['number_of_pearls_pd_n'] = 0