Changeset bde38b5 in sasmodels for sasmodels/kernelpy.py

Timestamp:

Aug 14, 2016 9:12:40 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:

ac98886

Parents:

b1c40bee

git-author:

Paul Kienzle <pkienzle@…> (08/14/16 21:08:59)

git-committer:

Paul Kienzle <pkienzle@…> (08/14/16 21:12:40)

Message:

simplify kernel calling

File:

• sasmodels/kernelpy.py (modified) (5 diffs)

sasmodels/kernelpy.py

@@ -100 +100 @@
     """
     def __init__(self, kernel, model_info, q_input):
+        # type: (callable, ModelInfo, List[np.ndarray]) -> None
         self.dtype = np.dtype('d')
         self.info = model_info
@@ -156 +157 @@
 
     def __call__(self, call_details, values, cutoff, magnetic):
-        assert isinstance(call_details, details.CallDetails)
+        # type: (CallDetails, np.ndarray, np.ndarray, float, bool) -> np.ndarray
+        if magnetic:
+            raise NotImplementedError("Magnetism not implemented for pure python models")
+        #print("Calling python kernel")
+        #call_details.show(values)
         res = _loops(self._parameter_vector, self._form, self._volume,
                      self.q_input.nq, call_details, values, cutoff)
@@ -162 +167 @@
 
     def release(self):
+        # type: () -> None
         """
         Free resources associated with the kernel.
@@ -189 +195 @@
             return np.ones(nq, 'd')*background
 
-    pd_value = values[2+n_pars:2+n_pars + call_details.pd_sum]
-    pd_weight = values[2+n_pars + call_details.pd_sum:]
+    pd_value = values[2+n_pars:2+n_pars + call_details.num_weights]
+    pd_weight = values[2+n_pars + call_details.num_weights:]
 
     pd_norm = 0.0
@@ -209 +215 @@
 
     total = np.zeros(nq, 'd')
-    for loop_index in range(call_details.pd_prod):
+    for loop_index in range(call_details.num_eval):
         # update polydispersity parameter values
         if p0_index == p0_length: