Changeset 9eb3632 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Jul 23, 2016 12:54:17 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:

7b7da6b

Parents:

6a0d6aa

Message:

restructure kernels using fixed PD loops

File:

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

sasmodels/sasview_model.py

@@ -23 +23 @@
 from . import weights
 from . import modelinfo
-from . import kernel
+from .details import build_details, dispersion_mesh
 
 try:
@@ -513 +513 @@
         parameters = self._model_info.parameters
         pairs = [self._get_weights(p) for p in parameters.call_parameters]
-        call_details, values = kernel.build_details(calculator, pairs)
-        # TODO: should test for 2d?
-        magnetic = any(values[k]!=0 for k in parameters.magnetism_index)
+        call_details, values, is_magnetic = build_details(calculator, pairs)
         result = calculator(call_details, values, cutoff=self.cutoff,
-                            magnetic=magnetic)
+                            magnetic=is_magnetic)
         calculator.release()
         return result
@@ -591 +589 @@
                 for p in self._model_info.parameters.call_parameters
                 if p.type == 'volume']
-        return kernel.dispersion_mesh(self._model_info, pars)
+        return dispersion_mesh(self._model_info, pars)
 
     def _get_weights(self, par):