Changeset 6dc78e4 in sasmodels for sasmodels/convert.py

Timestamp:

Aug 17, 2016 3:12:51 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:

deb854f, 300a2f7

Parents:

6b7e2f7

Message:

re-enable structure factor product

File:

• sasmodels/convert.py (modified) (1 diff)

sasmodels/convert.py

@@ -180 +180 @@
         composition_type, parts = model_info.composition
         if composition_type == 'product':
-            oldpars = {'scale':'scale_factor'}
-            oldpars.update(_get_old_pars(parts[0]))
-            oldpars.update(_get_old_pars(parts[1]))
+            translation = {'scale':'scale_factor'}
+            translation.update(_get_translation_table(parts[0]))
+            translation.update(_get_translation_table(parts[1]))
         else:
             raise NotImplementedError("cannot convert to sasview sum")
     else:
         translation = _get_translation_table(model_info)
-        oldpars = _revert_pars(_unscale_sld(model_info, pars), translation)
-        oldpars = _trim_vectors(model_info, pars, oldpars)
+    oldpars = _revert_pars(_unscale_sld(model_info, pars), translation)
+    oldpars = _trim_vectors(model_info, pars, oldpars)
 
     # Make sure the control parameter is an integer