Changeset d2bb604 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Apr 5, 2016 12:34:30 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:

21b116f

Parents:

1e2a1ba

Message:

fix models so all dll tests pass

File:

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

sasmodels/sasview_model.py

@@ -346 +346 @@
         """
         if self._model is None:
-            self._model = core.build_model(self._model_info, platform='dll')
+            self._model = core.build_model(self._model_info)
         q_vectors = [np.asarray(q) for q in args]
         kernel = self._model.make_kernel(q_vectors)
@@ -352 +352 @@
                  for p in self._model_info['parameters'].call_parameters]
         details, weights, values = core.build_details(kernel, pairs)
-        return kernel(details, weights, values, cutoff=self.cutoff)
+        result = kernel(details, weights, values, cutoff=self.cutoff)
         kernel.q_input.release()
         kernel.release()