Changeset 228cbd3 in sasmodels

Timestamp:

Mar 17, 2016 8:27:16 AM (9 years ago)

Author:

smk78

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:

c7062fe

Parents:

5111921

Message:

Added exceptions for i_zero in mono_gauss_coil and poly_gauss_coil

File:

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

sasmodels/convert.py

@@ -129 +129 @@
             warnings.warn("parameter background not used in sasview %s"%name)
 
+
     # If it is a product model P*S, then check the individual forms for special
     # cases.  Note: despite the structure factor alone not having scale or
@@ -146 +147 @@
             for p in "La", "Lb", "Lc", "Ld":
                 if p in oldpars: oldpars[p] *= 1e-13
+        elif name == 'core_shell_parallelepiped':
+            _remove_pd(oldpars, 'rimA', name)
+        elif name in ['mono_gauss_coil','poly_gauss_coil']:
+            del oldpars['i_zero']
 
     return oldpars
@@ -177 +182 @@
         elif name == 'rpa':
             pars['case_num'] = int(pars['case_num'])
+        elif name == 'mono_gauss_coil':
+            pars['i_zero'] = 1
+        elif name == 'poly_gauss_coil':
+            pars['i_zero'] = 1
+