Changeset 1780d59 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Aug 24, 2014 10:27:38 PM (10 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:

1f21edf

Parents:

ce27e21

Message:

hack sasview model polydispersity

File:

• sasmodels/sasview_model.py (modified) (5 diffs)

sasmodels/sasview_model.py

@@ -4 +4 @@
 import numpy as np
 
-def make_class(name, class_name=None):
+def make_class(name, class_name=None, dtype='single'):
     from .core import opencl_model
     if class_name is None:
         class_name = "".join(part.capitalize() for part in name.split('_')+['model'])
-    model =  opencl_model(name)
+    model =  opencl_model(name, dtype=dtype)
     class ConstructedModel(SasviewModel):
         kernel = model
         def __init__(self, multfactor=1):
-            if self.kernel is None:
-                self.__class__.kernel = opencl_model(name)
             SasviewModel.__init__(self, self.kernel)
     ConstructedModel.__name__ = class_name
@@ -46 +44 @@
                 'width': 0,
                 'npts': 35,
-                'nsigma': 3,
+                'nsigmas': 3,
                 'type': 'gaussian',
             }
@@ -160 +158 @@
         Return a list of all available parameters for the model
         """
-        list = []
-
-        for item in self.dispersion.keys():
-            for p in self.dispersion[item].keys():
-                if p not in ['type']:
-                    list.append('%s.%s' % (item.lower(), p.lower()))
-
-        return list
+        # TODO: fix test so that parameter order doesn't matter
+        ret = ['%s.%s'%(d.lower(), p)
+               for d in self._model.info['partype']['pd-2d']
+               for p in ('npts', 'nsigmas', 'width')]
+        #print ret
+        return ret
 
     def clone(self):
@@ -295 +291 @@
         :param dispersion: dispersion object of type Dispersion
         """
-        if parameter.lower() in (s.name.lower() for s in self.params.keys()):
+        if parameter.lower() in (s.lower() for s in self.params.keys()):
+            # 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]()
             self.dispersion[parameter] = dispersion.get_pars()
         else:
@@ -321 +333 @@
         dis = self.dispersion[par]
         v,w = weights.get_weights(
-            dis['type'], dis['npts'], dis['width'], dis['nsigma'],
+            dis['type'], dis['npts'], dis['width'], dis['nsigmas'],
             self.params[par], limits[par], par in relative)
         return v,w/w.max()
+