Changeset 0ff62d4 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Apr 15, 2016 10:31:35 AM (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/sasview_model.py (modified) (3 diffs)

sasmodels/sasview_model.py

@@ -27 +27 @@
 from . import generate
 from . import weights
-from . import details
 from . import modelinfo
+from . import kernel
 
 try:
@@ -502 +502 @@
         pairs = [self._get_weights(p)
                  for p in self._model_info.parameters.call_parameters]
-        call_details, weight, value = details.build_details(kernel, pairs)
+        call_details, weight, value = kernel.build_details(kernel, pairs)
         result = kernel(call_details, weight, value, cutoff=self.cutoff)
         kernel.release()
@@ -577 +577 @@
                 for p in self._model_info.parameters.call_parameters
                 if p.type == 'volume']
-        return details.dispersion_mesh(self._model_info, pars)
+        return kernel.dispersion_mesh(self._model_info, pars)
 
     def _get_weights(self, par):