Changeset 4edec6f in sasmodels

Timestamp:

Aug 1, 2016 5:33:41 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:

ec77322

Parents:

f67f26c

Message:

fix sasview for new kernel interface

File:

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

sasmodels/sasview_model.py

@@ -514 +514 @@
         pairs = [self._get_weights(p) for p in parameters.call_parameters]
         call_details, values, is_magnetic = build_details(calculator, pairs)
+        #call_details.show()
+        #print("pairs", pairs)
+        #print("params", self.params)
+        #print("values", values)
+        #print("is_mag", is_magnetic)
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
@@ -598 +603 @@
         if par.name not in self.params:
             if par.name == self.multiplicity_info.control:
-                return [self.multiplicity], []
+                return [self.multiplicity], [1.0]
             else:
-                return [np.NaN], []
+                return [np.NaN], [1.0]
         elif par.polydisperse:
             dis = self.dispersion[par.name]
@@ -608 +613 @@
             return value, weight / np.sum(weight)
         else:
-            return [self.params[par.name]], []
+            return [self.params[par.name]], [1.0]
 
 def test_model():