Changeset a0494e9 in sasmodels for sasmodels/convert.py

Timestamp:

Jul 18, 2016 11:43:54 PM (8 years ago)

Author:

Paul Kienzle <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:

c7ff92c

Parents:

263daec

Message:

allow comparison between onion/spherical_sld and sasview

File:

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

sasmodels/convert.py

@@ -243 +243 @@
             _remove_pd(oldpars, 'rimB', name)
             _remove_pd(oldpars, 'rimC', name)
+        elif name == 'spherical_sld':
+            for k in range(1, int(pars['n_shells'])+1):
+                _remove_pd(oldpars, 'thick_flat'+str(k), 'thick_flat')
+                _remove_pd(oldpars, 'thick_inter'+str(k), 'thick_inter')
         elif name == 'rpa':
             # convert scattering lengths from femtometers to centimeters
@@ -263 +267 @@
         elif name in ['mono_gauss_coil','poly_gauss_coil']:
             del oldpars['i_zero']
+        elif name == 'onion':
+            oldpars.pop('n_shells', None)
 
     return oldpars
@@ -302 +308 @@
         elif name == 'core_multi_shell':
             pars['n'] = min(math.ceil(pars['n']), 4)
-
+        elif name == 'spherical_sld':
+            for k in range(1, 11):
+                pars['thick_flat%d_pd_n'%k] = 0
+                pars['thick_inter%d_pd_n'%k] = 0
+