Changeset 9eb3632 in sasmodels for sasmodels/kernel.py

Timestamp:

Jul 22, 2016 10:54:17 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:

7b7da6b

Parents:

6a0d6aa

Message:

restructure kernels using fixed PD loops

File:

• sasmodels/kernel.py (modified) (2 diffs)

sasmodels/kernel.py

@@ -13 +13 @@
 
 import numpy as np
-from .details import mono_details, poly_details
 
 try:
@@ -48 +47 @@
         # type: () -> None
         pass
-
-try:
-    np.meshgrid([])
-    meshgrid = np.meshgrid
-except ValueError:
-    # CRUFT: np.meshgrid requires multiple vectors
-    def meshgrid(*args):
-        if len(args) > 1:
-            return np.meshgrid(*args)
-        else:
-            return [np.asarray(v) for v in args]
-
-def dispersion_mesh(model_info, pars):
-    """
-    Create a mesh grid of dispersion parameters and weights.
-
-    Returns [p1,p2,...],w where pj is a vector of values for parameter j
-    and w is a vector containing the products for weights for each
-    parameter set in the vector.
-    """
-    value, weight = zip(*pars)
-    weight = [w if w else [1.] for w in weight]
-    weight = np.vstack([v.flatten() for v in meshgrid(*weight)])
-    weight = np.prod(weight, axis=0)
-    value = [v.flatten() for v in meshgrid(*value)]
-    lengths = [par.length for par in model_info.parameters.kernel_parameters
-               if par.type == 'volume']
-    if any(n > 1 for n in lengths):
-        pars = []
-        offset = 0
-        for n in lengths:
-            pars.append(np.vstack(value[offset:offset+n]) if n > 1 else value[offset])
-            offset += n
-        value = pars
-    return value, weight
-
-
-
-def build_details(kernel, pairs):
-    # type: (Kernel, Tuple[List[np.ndarray], List[np.ndarray]]) -> Tuple[CallDetails, np.ndarray, np.ndarray]
-    """
-    Construct the kernel call details object for calling the particular kernel.
-    """
-    values, weights = zip(*pairs)
-    scalars = [v[0] for v in values]
-    if all(len(w)==1 for w in weights):
-        call_details = mono_details(kernel.info)
-        data = np.array(scalars, dtype=kernel.dtype)
-    else:
-        call_details = poly_details(kernel.info, weights)
-        data = np.hstack(scalars+list(values)+list(weights)).astype(kernel.dtype)
-    return call_details, data