Changeset eeea6a3 in sasview


Ignore:
Timestamp:
Sep 13, 2018 9:34:05 AM (7 days ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_Pr_fixes
Children:
4b7d322
Parents:
2385397
Message:

Simulated error handling added to more logical place

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    r28965e9 reeea6a3  
    462462            self._calculator.set_qmin(qmin) 
    463463            self._calculator.set_qmax(qmax) 
     464            if np.size(self.logic.data.dy) == 0 or np.all(self.logic.data.dy) == 0: 
     465                self.logic.data.dy = self._calculator.add_errors(self.logic.data.y) 
    464466            self.updateDataList(data) 
    465467            self.populateDataComboBox(self.logic.data.filename, data) 
  • src/sas/sascalc/pr/invertor.py

    r13da5f5 reeea6a3  
    258258        invertor.x = self.x 
    259259        invertor.y = self.y 
    260         if np.size(self.err) == 0 or np.all(self.err) == 0: 
    261             invertor.err = self.add_errors(self.y) 
    262         else: 
    263             invertor.err = self.err 
     260        invertor.err = self.err 
    264261        invertor.est_bck = self.est_bck 
    265262        invertor.background = self.background 
     
    306303        # Reset the background value before proceeding 
    307304        # self.background = 0.0 
    308         if np.size(self.err) == 0 or np.all(self.err) == 0: 
    309             self.err = self.add_errors(self.y) 
    310305        if not self.est_bck: 
    311306            self.y -= self.background 
Note: See TracChangeset for help on using the changeset viewer.