Changeset 6d6508e in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 7, 2016 6:57:33 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:

d2fc9a4

Parents:

3707eee

Message:

refactor model_info from dictionary to class

File:

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

sasmodels/kerneldll.py

@@ -55 +55 @@
 
 from . import generate
+from . import details
 from .kernelpy import PyInput, PyModel
 from .exception import annotate_exception
@@ -95 +96 @@
     """
     bits = 8*dtype.itemsize
-    return "sas_%s%d"%(model_info['id'], bits)
+    return "sas_%s%d"%(model_info.id, bits)
 
 def dll_path(model_info, dtype):
@@ -123 +124 @@
     models are allowed as DLLs.
     """
-    if callable(model_info.get('Iq', None)):
+    if callable(model_info.Iq):
         return PyModel(model_info)
     
@@ -259 +260 @@
         self.result = np.empty(q_input.nq+3, q_input.dtype)
 
-    def __call__(self, details, weights, values, cutoff):
+    def __call__(self, call_details, weights, values, cutoff):
         real = (np.float32 if self.q_input.dtype == generate.F32
                 else np.float64 if self.q_input.dtype == generate.F64
                 else np.float128)
-        assert isinstance(details, generate.CoordinationDetails)
+        assert isinstance(call_details, details.CallDetails)
         assert weights.dtype == real and values.dtype == real
 
-        start, stop = 0, details.total_pd
+        start, stop = 0, call_details.total_pd
         #print("in kerneldll")
         #print("weights", weights)
@@ -274 +275 @@
             start, # pd_start
             stop, # pd_stop pd_stride[MAX_PD]
-            details.ctypes.data, # problem
+            call_details.ctypes.data, # problem
             weights.ctypes.data,  # weights
             values.ctypes.data,  #pars