Changeset ea05c87 in sasmodels for sasmodels/compare.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/compare.py (modified) (3 diffs)

sasmodels/compare.py

@@ -41 +41 @@
 from .data import plot_theory, empty_data1D, empty_data2D
 from .direct_model import DirectModel
-from .convert import revert_pars, constrain_new_to_old
+from .convert import revert_name, revert_pars, constrain_new_to_old
 
 USAGE = """
@@ -341 +341 @@
 def eval_sasview(model_info, data):
     """
-    Return a model calculator using the SasView fitting engine.
+    Return a model calculator using the pre-4.0 SasView models.
     """
     # importing sas here so that the error message will be that sas failed to
@@ -360 +360 @@
         composition_type, parts = model_info['composition']
         if composition_type == 'product':
-            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
-            P, S = [get_model(p) for p in model_info['oldname']]
+            from sas.models.MultiplicationModel import MultiplicationModel
+            P, S = [get_model(revert_name(p)) for p in parts]
             model = MultiplicationModel(P, S)
         else:
             raise ValueError("sasview mixture models not supported by compare")
     else:
-        model = get_model(model_info['oldname'])
+        model = get_model(revert_name(model_info))
 
     # build a smearer with which to call the model, if necessary