Changeset eeea6a3 in sasview for src

Timestamp:

Sep 13, 2018 9:34:05 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

4b7d322

Parents:

2385397

Message:

Simulated error handling added to more logical place

Location:

src/sas

Files:

• qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (1 diff)
• sascalc/pr/invertor.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -462 +462 @@
             self._calculator.set_qmin(qmin)
             self._calculator.set_qmax(qmax)
+            if np.size(self.logic.data.dy) == 0 or np.all(self.logic.data.dy) == 0:
+                self.logic.data.dy = self._calculator.add_errors(self.logic.data.y)
             self.updateDataList(data)
             self.populateDataComboBox(self.logic.data.filename, data)

src/sas/sascalc/pr/invertor.py

@@ -258 +258 @@
         invertor.x = self.x
         invertor.y = self.y
-        if np.size(self.err) == 0 or np.all(self.err) == 0:
-            invertor.err = self.add_errors(self.y)
-        else:
-            invertor.err = self.err
+        invertor.err = self.err
         invertor.est_bck = self.est_bck
         invertor.background = self.background
@@ -306 +303 @@
         # Reset the background value before proceeding
         # self.background = 0.0
-        if np.size(self.err) == 0 or np.all(self.err) == 0:
-            self.err = self.add_errors(self.y)
         if not self.est_bck:
             self.y -= self.background