Changeset bc7ad41 in sasmodels for sasmodels/sesans.py

Timestamp:

Feb 2, 2017 8:13:52 AM (7 years ago)

Author:

jhbakker

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

94d13f1

Parents:

2f8ee5f

Message:

Moved test data, Hankel matrices no longer private variables

File:

• sasmodels/sesans.py (modified) (3 diffs)

sasmodels/sesans.py

@@ -28 +28 @@
 
     # transform arrays
-    _H = None  # type: np.ndarray
-    _H0 = None # type: np.ndarray
+    H = None  # type: np.ndarray
+    H0 = None # type: np.ndarray
 
-    def set_transform(self, SE, zaccept, Rmax):
+    def __init__(self, SE, zaccept, Rmax):
         if self.SE is None or len(SE) != len(self.SE) or np.any(SE != self.SE) or zaccept != self.zaccept or Rmax != self.Rmax:
             self.SE, self.zaccept, self.Rmax = SE, zaccept, Rmax
@@ -38 +38 @@
 
     def apply(self, Iq):
-        G0 = np.dot(self._H0, Iq)
-        G = np.dot(self._H.T, Iq)
+        G0 = np.dot(self.H0, Iq)
+        G = np.dot(self.H.T, Iq)
         P = G - G0
         return P
@@ -76 +76 @@
         #H = dq / (2 * pi) * j0(repSE*repq)*repq
 
-        self._H, self._H0 = H, H0
+        self.H, self.H0 = H, H0
 
 class SESANS1D(SesansTransform):
-    def __init__(self, data, _H0, _H, q_calc):
+    def __init__(self, data, H0, H, q_calc):
         # x values of the data (Sasview requires these to be named "q")
         self.q = data.x
-        self._H0 = _H0
-        self._H = _H
+        self.H0 = H0
+        self.H = H
         # Pysmear does some checks on the smearer object, these checks require the "data" object...
         self.data=data