Changeset 4bfd277 in sasmodels for sasmodels/kernelpy.py

Timestamp:

Apr 8, 2016 12:11:16 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:

2afc26d

Parents:

d2fc9a4

Message:

support ER/VR calls with vector parameters

File:

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

sasmodels/kernelpy.py

@@ -10 +10 @@
 from numpy import pi, cos
 
+from . import details
 from .generate import F64
 
@@ -145 +146 @@
 
     def __call__(self, call_details, weights, values, cutoff):
-        # type: (.generate.CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
+        assert isinstance(call_details, details.CallDetails)
         res = _loops(self._parameter_vector, self._form, self._volume,
                      self.q_input.nq, call_details, weights, values, cutoff)
@@ -160 +161 @@
            form_volume, # type: Callable[[], float]
            nq,          # type: int
-           call_details,# type: .generate.CallDetails
+           call_details,# type: details.CallDetails
            weights,     # type: np.ndarray
            values,      # type: np.ndarray
@@ -205 +206 @@
                 this_offset = call_details.par_offset[par]
                 block_size = 1
-                for bit in xrange(32):
+                for bit in range(len(pd_offset)):
                     if coord&1:
                         this_offset += block_size * pd_index[bit]
@@ -245 +246 @@
 
 
+def _create_default_functions(model_info):
+    """
+    Autogenerate missing functions, such as Iqxy from Iq.
+
+    This only works for Iqxy when Iq is written in python. :func:`make_source`
+    performs a similar role for Iq written in C.  This also vectorizes
+    any functions that are not already marked as vectorized.
+    """
+    _create_vector_Iq(model_info)
+    _create_vector_Iqxy(model_info)  # call create_vector_Iq() first
+
 
 def _create_vector_Iq(model_info):
@@ -252 +264 @@
     Iq = model_info.Iq
     if callable(Iq) and not getattr(Iq, 'vectorized', False):
+        #print("vectorizing Iq")
         def vector_Iq(q, *args):
             """
@@ -265 +278 @@
     """
     Iq, Iqxy = model_info.Iq, model_info.Iqxy
-    if callable(Iqxy) and not getattr(Iqxy, 'vectorized', False):
-        def vector_Iqxy(qx, qy, *args):
-            """
-            Vectorized 2D kernel.
-            """
-            return np.array([Iqxy(qxi, qyi, *args) for qxi, qyi in zip(qx, qy)])
-        vector_Iqxy.vectorized = True
-        model_info.Iqxy = vector_Iqxy
+    if callable(Iqxy):
+        if not getattr(Iqxy, 'vectorized', False):
+            #print("vectorizing Iqxy")
+            def vector_Iqxy(qx, qy, *args):
+                """
+                Vectorized 2D kernel.
+                """
+                return np.array([Iqxy(qxi, qyi, *args) for qxi, qyi in zip(qx, qy)])
+            vector_Iqxy.vectorized = True
+            model_info.Iqxy = vector_Iqxy
     elif callable(Iq):
+        #print("defaulting Iqxy")
         # Iq is vectorized because create_vector_Iq was already called.
         def default_Iqxy(qx, qy, *args):
@@ -283 +299 @@
         model_info.Iqxy = default_Iqxy
 
-def _create_default_functions(model_info):
-    """
-    Autogenerate missing functions, such as Iqxy from Iq.
-
-    This only works for Iqxy when Iq is written in python. :func:`make_source`
-    performs a similar role for Iq written in C.  This also vectorizes
-    any functions that are not already marked as vectorized.
-    """
-    _create_vector_Iq(model_info)
-    _create_vector_Iqxy(model_info)  # call create_vector_Iq() first
-