Changeset 0ff62d4 in sasmodels for sasmodels/direct_model.py

Timestamp:

Apr 15, 2016 12:31:35 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:

f2f67a6

Parents:

8f6817d

Message:

refactor: move dispersion_mesh alongside build_details in kernel.py

File:

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

sasmodels/direct_model.py

@@ -30 +30 @@
 from . import resolution
 from . import resolution2d
-from . import details
+from . import kernel
 
 try:
@@ -41 +41 @@
     from .modelinfo import Parameter, ParameterSet
 
-def call_kernel(kernel, pars, cutoff=0., mono=False):
+def call_kernel(calculator, pars, cutoff=0., mono=False):
     # type: (Kernel, ParameterSet, float, bool) -> np.ndarray
     """
@@ -55 +55 @@
     *mono* is True if polydispersity should be set to none on all parameters.
     """
-    parameters = kernel.info.parameters
+    parameters = calculator.info.parameters
     if mono:
         active = lambda name: False
-    elif kernel.dim == '1d':
+    elif calculator.dim == '1d':
         active = lambda name: name in parameters.pd_1d
-    elif kernel.dim == '2d':
+    elif calculator.dim == '2d':
         active = lambda name: name in parameters.pd_2d
     else:
@@ -69 +69 @@
                 for p in parameters.call_parameters]
 
-    call_details, weights, values = details.build_details(kernel, vw_pairs)
-    return kernel(call_details, weights, values, cutoff)
+    call_details, weights, values = kernel.build_details(calculator, vw_pairs)
+    return calculator(call_details, weights, values, cutoff)
 
 def get_weights(parameter, values):