Changeset 65ceb7d in sasmodels for sasmodels/direct_model.py

Timestamp:

Sep 18, 2017 12:53:23 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

3a45c2c

Parents:

2f9f1ec (diff), 058460c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into costrafo411

File:

• sasmodels/direct_model.py (modified) (1 diff)

sasmodels/direct_model.py

@@ -296 +296 @@
         self.Iq = y
         if self.data_type in ('Iq', 'Iq-oriented'):
+            if self._data.y is None:
+                self._data.y = np.empty(len(self._data.x), 'd')
+            if self._data.dy is None:
+                self._data.dy = np.empty(len(self._data.x), 'd')
             self._data.dy[self.index] = dy
             self._data.y[self.index] = y
         elif self.data_type == 'Iqxy':
+            if self._data.data is None:
+                self._data.data = np.empty_like(self._data.qx_data, 'd')
+            if self._data.err_data is None:
+                self._data.err_data = np.empty_like(self._data.qx_data, 'd')
             self._data.data[self.index] = y
+            self._data.err_data[self.index] = dy
         elif self.data_type == 'sesans':
+            if self._data.y is None:
+                self._data.y = np.empty(len(self._data.x), 'd')
             self._data.y[self.index] = y
         else: