Changeset 41e7f2e in sasmodels for sasmodels/compare.py

Timestamp:

Oct 1, 2016 2:04:51 PM (8 years ago)

Author:

ajj

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:

3a45c2c

Parents:

80013a6 (diff), 2f46e83 (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 branch 'master' into ticket651

File:

• sasmodels/compare.py (modified) (4 diffs)

sasmodels/compare.py

@@ -38 +38 @@
 from . import core
 from . import kerneldll
+from . import weights
 from .data import plot_theory, empty_data1D, empty_data2D
 from .direct_model import DirectModel
@@ -390 +391 @@
     from sas.models.qsmearing import smear_selection
     from sas.models.MultiplicationModel import MultiplicationModel
+    from sas.models.dispersion_models import models as dispersers
 
     def get_model_class(name):
@@ -422 +424 @@
         ModelClass = get_model_class(old_name)
         model = [ModelClass()]
+    model[0].disperser_handles = {}
 
     # build a smearer with which to call the model, if necessary
@@ -458 +461 @@
             model[0] = ModelClass(control)
         # paying for parameter conversion each time to keep life simple, if not fast
+        for k, v in oldpars.items():
+            if k.endswith('.type'):
+                par = k[:-5]
+                cls = dispersers[v if v != 'rectangle' else 'rectangula']
+                handle = cls()
+                model[0].disperser_handles[par] = handle
+                model[0].set_dispersion(par, handle)
+
         #print("sasview pars",oldpars)
         for k, v in oldpars.items():
             name_attr = k.split('.')  # polydispersity components
             if len(name_attr) == 2:
-                model[0].dispersion[name_attr[0]][name_attr[1]] = v
+                par, disp_par = name_attr
+                model[0].dispersion[par][disp_par] = v
             else:
                 model[0].setParam(k, v)