Changeset ea05c87 in sasmodels for sasmodels/product.py

Timestamp:

Apr 4, 2016 4:47:27 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:

1e2a1ba

Parents:

9d96649 (diff), ec45c4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/models/spherical_sld.py

File:

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

sasmodels/product.py

@@ -41 +41 @@
     if len(set(p.name for p in pars)) != len(pars):
         raise ValueError("Duplicate parameters in %s and %s"%(p_id))
-    # For comparison with sasview, determine the old parameters.
-    oldname = [p_info['oldname'], s_info['oldname']]
-    oldpars = {'scale':'scale_factor'}
-    oldpars.update(p_info['oldpars'])
-    oldpars.update(s_info['oldpars'])
-
     model_info = {}
     model_info['id'] = '*'.join((p_id, s_id))
@@ -62 +56 @@
     #model_info['source'] = []
     # Iq, Iqxy, form_volume, ER, VR and sesans
-    model_info['oldname'] = oldname
-    model_info['oldpars'] = oldpars
     model_info['composition'] = ('product', [p_info, s_info])
     return model_info