Changeset 17bbadd in sasmodels for sasmodels/kernelpy.py

Timestamp:

Mar 15, 2016 12:47:12 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:

754e27b

Parents:

5ceb7d0

Message:

refactor so all model defintion queries use model_info; better documentation of model_info structure; initial implementation of product model (broken)

File:

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

sasmodels/kernelpy.py

@@ -16 +16 @@
     Wrapper for pure python models.
     """
-    def __init__(self, info):
-        self.info = info
+    def __init__(self, model_info):
+        self.info = model_info
 
     def __call__(self, q_vectors):
@@ -68 +68 @@
     *kernel* is the DllKernel object to call.
 
-    *info* is the module information
+    *model_info* is the module information
 
     *q_input* is the DllInput q vectors at which the kernel should be
@@ -81 +81 @@
     Call :meth:`release` when done with the kernel instance.
     """
-    def __init__(self, kernel, info, q_input):
-        self.info = info
+    def __init__(self, kernel, model_info, q_input):
+        self.info = model_info
         self.q_input = q_input
         self.res = np.empty(q_input.nq, q_input.dtype)
@@ -106 +106 @@
         else:
             self.kernel = kernel
-        fixed_pars = info['partype']['fixed-' + dim]
-        pd_pars = info['partype']['pd-' + dim]
-        vol_pars = info['partype']['volume']
+        fixed_pars = model_info['partype']['fixed-' + dim]
+        pd_pars = model_info['partype']['pd-' + dim]
+        vol_pars = model_info['partype']['volume']
 
         # First two fixed pars are scale and background
-        pars = [p[0] for p in info['parameters'][2:]]
+        pars = [p[0] for p in model_info['parameters'][2:]]
         offset = len(self.q_input.q_vectors)
         self.args = self.q_input.q_vectors + [None] * len(pars)