Changeset 745b7bb in sasmodels for sasmodels/sasview_model.py

Timestamp:

Aug 4, 2016 9:32:17 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:

4e0968b

Parents:

54bcd4a

Message:

spherical sld: doc cleanup

File:

• sasmodels/sasview_model.py (modified) (1 diff)

sasmodels/sasview_model.py

@@ -323 +323 @@
                 beta is a list of the corresponding SLD values
         """
-        args = [] # type: List[Union[float, np.ndarray]]
+        args = {} # type: Dict[str, Any]
         for p in self._model_info.parameters.kernel_parameters:
             if p.id == self.multiplicity_info.control:
-                args.append(float(self.multiplicity))
+                value = float(self.multiplicity)
             elif p.length == 1:
-                args.append(self.params.get(p.id, np.NaN))
+                value = self.params.get(p.id, np.NaN)
             else:
-                args.append([self.params.get(p.id+str(k), np.NaN)
-                             for k in range(1,p.length+1)])
-        return self._model_info.profile(*args)
+                value = np.array([self.params.get(p.id+str(k), np.NaN)
+                                  for k in range(1,p.length+1)]
+            args[p.id] = value
+
+        return self._model_info.profile(**args)
 
     def setParam(self, name, value):