Changeset aa4946b in sasmodels for sasmodels/sasview_model.py

Timestamp:

Mar 11, 2015 11:15:40 PM (9 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:

af1d68c

Parents:

49d1d42f

Message:

refactor so kernels are loaded via core.load_model

File:

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

sasmodels/sasview_model.py

@@ -14 +14 @@
 """
 
-# TODO: add a sasview=>sasmodels parameter translation layer
-# this will allow us to use the new sasmodels as drop in replacements, and
-# delay renaming parameters until all models have been converted.
-
 import math
 from copy import deepcopy
@@ -24 +20 @@
 import numpy as np
 
-try:
-    from .kernelcl import load_model
-except ImportError, exc:
-    warnings.warn(str(exc))
-    warnings.warn("using ctypes instead")
-    from .kerneldll import load_model
-
-
-def make_class(kernel_module, dtype='single', namestyle='name'):
+from . import core
+
+def make_class(model_definition, dtype='single', namestyle='name'):
     """
     Load the sasview model defined in *kernel_module*.
@@ -38 +28 @@
     Returns a class that can be used directly as a sasview model.
 
-    Defaults to using the new name for a model. Setting namestyle='name'
-    will produce a class with a name compatible with SasView
+    Defaults to using the new name for a model.  Setting
+    *namestyle='oldname'* will produce a class with a name
+    compatible with SasView.
     """
-    model = load_model(kernel_module, dtype=dtype)
+    model = core.load_model(model_definition, dtype=dtype)
     def __init__(self, multfactor=1):
         SasviewModel.__init__(self, model)
@@ -313 +304 @@
             return 1.0
         else:
-            vol_pars = self._model.info['partype']['volume']
-            values, weights = self._dispersion_mesh(vol_pars)
+            values, weights = self._dispersion_mesh()
             fv = ER(*values)
             #print values[0].shape, weights.shape, fv.shape
@@ -329 +319 @@
             return 1.0
         else:
-            vol_pars = self._model.info['partype']['volume']
-            values, weights = self._dispersion_mesh(vol_pars)
+            values, weights = self._dispersion_mesh()
             whole, part = VR(*values)
             return np.sum(weights * part) / np.sum(weights * whole)
@@ -362 +351 @@
             raise ValueError("%r is not a dispersity or orientation parameter")
 
-    def _dispersion_mesh(self, pars):
+    def _dispersion_mesh(self):
         """
         Create a mesh grid of dispersion parameters and weights.
@@ -370 +359 @@
         parameter set in the vector.
         """
-        values, weights = zip(*[self._get_weights(p) for p in pars])
-        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=0)
-        return values, weights
+        pars = self._model.info['partype']['volume']
+        return core.dispersion_mesh([self._get_weights(p) for p in pars])
 
     def _get_weights(self, par):