Changeset fa800e72 in sasmodels

Timestamp:

Jun 27, 2016 12:43:39 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:

3a45c2c

Parents:

e758662

Message:

fix disperser support for sasview 4.0

Location:

sasmodels

Files:

• sasview_model.py (modified) (1 diff)
• weights.py (modified) (1 diff)

sasmodels/sasview_model.py

@@ -484 +484 @@
         :param dispersion: dispersion object of type Dispersion
         """
-        if parameter in (s for s in self.params.keys()):
+        if parameter in self.params:
             # TODO: Store the disperser object directly in the model.
-            # The current method of creating one on the fly whenever it is
-            # needed is kind of funky.
-            # Note: can't seem to get disperser parameters from sasview
-            # (1) Could create a sasview model that has not yet # been
-            # converted, assign the disperser to one of its polydisperse
-            # parameters, then retrieve the disperser parameters from the
-            # sasview model.  (2) Could write a disperser parameter retriever
-            # in sasview.  (3) Could modify sasview to use sasmodels.weights
-            # dispersers.
-            # For now, rely on the fact that the sasview only ever uses
-            # new dispersers in the set_dispersion call and create a new
-            # one instead of trying to assign parameters.
-            from . import weights
-            disperser = weights.dispersers[dispersion.__class__.__name__]
-            dispersion = weights.models[disperser]()
+            # The current method of relying on the sasview gui to
+            # remember them is kind of funky.
             self.dispersion[parameter] = dispersion.get_pars()
         else:

sasmodels/weights.py

@@ -205 +205 @@
     v, w = obj.get_weights(value, limits[0], limits[1], relative)
     return v, w
-
-# Hack to allow sasview dispersion objects to interoperate with sasmodels
-dispersers = dict((v.__name__, k) for k, v in MODELS.items())
-dispersers['DispersionModel'] = RectangleDispersion.type
-