Changeset 8d62008 in sasmodels for sasmodels/details.py

Timestamp:

Apr 15, 2016 10:16:41 AM (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:

8f6817d

Parents:

3599d36

Message:

remove circular dependency between details/modelinfo; fix compare Calculator type hint

File:

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

sasmodels/details.py

@@ -5 +5 @@
 except ImportError:
     pass
+else:
+    from .modelinfo import ModelInfo
 
 
@@ -10 +12 @@
     parts = None  # type: List["CallDetails"]
     def __init__(self, model_info):
+        # type: (ModelInfo) -> None
         parameters = model_info.parameters
         max_pd = parameters.max_pd
         npars = parameters.npars
         par_offset = 4*max_pd
-        self._details = np.zeros(par_offset + 3*npars + 4, 'i4')
+        self.buffer = np.zeros(par_offset + 3 * npars + 4, 'i4')
 
         # generate views on different parts of the array
-        self._pd_par     = self._details[0*max_pd:1*max_pd]
-        self._pd_length  = self._details[1*max_pd:2*max_pd]
-        self._pd_offset  = self._details[2*max_pd:3*max_pd]
-        self._pd_stride  = self._details[3*max_pd:4*max_pd]
-        self._par_offset = self._details[par_offset+0*npars:par_offset+1*npars]
-        self._par_coord  = self._details[par_offset+1*npars:par_offset+2*npars]
-        self._pd_coord   = self._details[par_offset+2*npars:par_offset+3*npars]
+        self._pd_par     = self.buffer[0 * max_pd:1 * max_pd]
+        self._pd_length  = self.buffer[1 * max_pd:2 * max_pd]
+        self._pd_offset  = self.buffer[2 * max_pd:3 * max_pd]
+        self._pd_stride  = self.buffer[3 * max_pd:4 * max_pd]
+        self._par_offset = self.buffer[par_offset + 0 * npars:par_offset + 1 * npars]
+        self._par_coord  = self.buffer[par_offset + 1 * npars:par_offset + 2 * npars]
+        self._pd_coord   = self.buffer[par_offset + 2 * npars:par_offset + 3 * npars]
 
         # theta_par is fixed
-        self._details[-1] = parameters.theta_offset
-
-    @property
-    def ctypes(self): return self._details.ctypes
+        self.buffer[-1] = parameters.theta_offset
 
     @property
@@ -53 +53 @@
 
     @property
-    def num_active(self): return self._details[-4]
+    def num_active(self): return self.buffer[-4]
     @num_active.setter
-    def num_active(self, v): self._details[-4] = v
+    def num_active(self, v): self.buffer[-4] = v
 
     @property
-    def total_pd(self): return self._details[-3]
+    def total_pd(self): return self.buffer[-3]
     @total_pd.setter
-    def total_pd(self, v): self._details[-3] = v
+    def total_pd(self, v): self.buffer[-3] = v
 
     @property
-    def num_coord(self): return self._details[-2]
+    def num_coord(self): return self.buffer[-2]
     @num_coord.setter
-    def num_coord(self, v): self._details[-2] = v
+    def num_coord(self, v): self.buffer[-2] = v
 
     @property
-    def theta_par(self): return self._details[-1]
+    def theta_par(self): return self.buffer[-1]
 
     def show(self):
@@ -81 +81 @@
         print("par_coord", self.par_coord)
         print("pd_coord", self.pd_coord)
-        print("theta par", self._details[-1])
+        print("theta par", self.buffer[-1])
 
 def build_details(kernel, pairs):
@@ -88 +88 @@
         call_details = poly_details(kernel.info, weights)
     else:
-        call_details = kernel.info.mono_details
+        call_details = mono_details(kernel.info)
     weights, values = [np.hstack(v) for v in (weights, values)]
     weights = weights.astype(dtype=kernel.dtype)