Changeset 6a0d6aa in sasmodels

Timestamp:

Jul 21, 2016 5:42:33 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:

9eb3632

Parents:

b966a96

Message:

magnetic models working in sasview

Location:

sasmodels

Files:

• kernel_template.c (modified) (2 diffs)
• sasview_model.py (modified) (2 diffs)

sasmodels/kernel_template.c

@@ -32 +32 @@
          #define NEED_EXPM1
          #define NEED_TGAMMA
+         #define NEED_ERF
      #else
          #define kernel extern "C"
@@ -50 +51 @@
          #define NEED_EXPM1
          #define NEED_TGAMMA
+         #define NEED_ERF
      #else
          #include <tgmath.h> // C99 type-generic math, so sin(float) => sinf

sasmodels/sasview_model.py

@@ -503 +503 @@
         to the card for each evaluation.
         """
+        #core.HAVE_OPENCL = False
         if self._model is None:
             self._model = core.build_model(self._model_info)
@@ -510 +511 @@
             q_vectors = [np.asarray(qx)]
         calculator = self._model.make_kernel(q_vectors)
-        pairs = [self._get_weights(p)
-                 for p in self._model_info.parameters.call_parameters]
-        call_details, value = kernel.build_details(calculator, pairs)
-        result = calculator(call_details, value, cutoff=self.cutoff, magnetic=False)
+        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)
+        result = calculator(call_details, values, cutoff=self.cutoff,
+                            magnetic=magnetic)
         calculator.release()
         return result