Changeset d1ff3a5 in sasmodels

Timestamp:

Jul 26, 2017 12:52:11 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

72be531

Parents:

b139ee6

Message:

make sure y, dy exists when setting simulated data

File:

• sasmodels/direct_model.py (modified) (2 diffs)

sasmodels/direct_model.py

@@ -293 +293 @@
         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:
@@ -315 +326 @@
         # TODO: extend plotting of calculate Iq to other measurement types
         # TODO: refactor so we don't store the result in the model
-        self.Iq_calc = None
+        self.Iq_calc = Iq_calc
         if self.data_type == 'sesans':
             Iq_mono = (call_kernel(self._kernel_mono, pars, mono=True)