Changeset 32c160a in sasmodels for sasmodels/sasview_model.py

Timestamp:

Aug 25, 2014 12:55:08 AM (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:

13d86bc

Parents:

1f21edf

Message:

support ER/VR python kernels; move metadata to python

File:

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

sasmodels/sasview_model.py

@@ -4 +4 @@
 import numpy as np
 
-def make_class(name, class_name=None, dtype='single'):
+def make_class(kernel_module, 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, dtype=dtype)
-    class ConstructedModel(SasviewModel):
-        kernel = model
-        def __init__(self, multfactor=1):
-            SasviewModel.__init__(self, self.kernel)
-    ConstructedModel.__name__ = class_name
+    model =  opencl_model(kernel_module, dtype=dtype)
+    def __init__(self, multfactor=1):
+        SasviewModel.__init__(self, self.kernel)
+    attrs = dict(__init__=__init__, kernel=model)
+    ConstructedModel = type(model.info['name'],  (SasviewModel,), attrs)
+    #class ConstructedModel(SasviewModel):
+    #    kernel = model
+    #    def __init__(self, multfactor=1):
+    #        SasviewModel.__init__(self, self.kernel)
+    #ConstructedModel.__name__ = model.info['name']
     return ConstructedModel
 
@@ -267 +269 @@
             values, weights = self._dispersion_mesh(vol_pars)
             fv = ER(*values)
+            #print values[0].shape, weights.shape, fv.shape
             return np.sum(weights*fv) / np.sum(weights)
 
@@ -275 +278 @@
         :return: the value of the volf ratio
         """
-        VR = self._model.info.get('ER', None)
+        VR = self._model.info.get('VR', None)
         if VR is None:
             return 1.0
@@ -323 +326 @@
         values = [v.flatten() for v in np.meshgrid(*values)]
         weights = np.vstack([v.flatten() for v in np.meshgrid(*weights)])
-        weights = np.prod(weights, axis=1)
+        weights = np.prod(weights, axis=0)
         return values, weights