Changeset ac07a3a in sasview for src/sas/sasgui/perspectives/pr
- Timestamp:
- Apr 9, 2017 6:08:43 AM (8 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 7432acb
- Parents:
- 235f514
- Location:
- src/sas/sasgui/perspectives/pr
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified src/sas/sasgui/perspectives/pr/pr.py ¶
r235f514 rac07a3a 291 291 """ 292 292 qtemp = pr.x 293 if not q isNone:293 if q is not None: 294 294 qtemp = q 295 295 … … 303 303 304 304 # Check for user min/max 305 if not pr.q_min isNone:305 if pr.q_min is not None: 306 306 minq = pr.q_min 307 if not pr.q_max isNone:307 if pr.q_max is not None: 308 308 maxq = pr.q_max 309 309 … … 487 487 scale = None 488 488 min_err = 0.0 489 if not path isNone:489 if path is not None: 490 490 input_f = open(path, 'r') 491 491 buff = input_f.read() … … 512 512 logger.error(sys.exc_value) 513 513 514 if not scale isNone:514 if scale is not None: 515 515 message = "The loaded file had no error bars, statistical errors are assumed." 516 516 wx.PostEvent(self.parent, StatusEvent(status=message)) … … 537 537 538 538 data_started = False 539 if not path isNone:539 if path is not None: 540 540 input_f = open(path, 'r') 541 541 buff = input_f.read() … … 565 565 data_started = True 566 566 567 if not scale isNone:567 if scale is not None: 568 568 message = "The loaded file had no error bars, statistical errors are assumed." 569 569 wx.PostEvent(self.parent, StatusEvent(status=message)) … … 761 761 self.elapsed = elapsed 762 762 self.control_panel.alpha_estimate = alpha 763 if not message isNone:763 if message is not None: 764 764 wx.PostEvent(self.parent, StatusEvent(status=str(message))) 765 765 self.perform_estimateNT() … … 779 779 self.control_panel.nterms_estimate = nterms 780 780 self.control_panel.alpha_estimate = alpha 781 if not message isNone:781 if message is not None: 782 782 wx.PostEvent(self.parent, StatusEvent(status=str(message))) 783 783 … … 921 921 try: 922 922 pr = self._create_plot_pr() 923 if not pr isNone:923 if pr is not None: 924 924 self.pr = pr 925 925 self.perform_inversion() … … 944 944 try: 945 945 pr = self._create_plot_pr() 946 if not pr isNone:946 if pr is not None: 947 947 self.pr = pr 948 948 self.perform_estimate() … … 1024 1024 try: 1025 1025 pr = self._create_file_pr(data) 1026 if not pr isNone:1026 if pr is not None: 1027 1027 self.pr = pr 1028 1028 self.perform_inversion() -
TabularUnified src/sas/sasgui/perspectives/pr/pr_thread.py ¶
r235f514 rac07a3a 42 42 pass 43 43 except: 44 if not self.error_func isNone:44 if self.error_func is not None: 45 45 self.error_func("CalcPr.compute: %s" % sys.exc_value) 46 46 … … 70 70 pass 71 71 except: 72 if not self.error_func isNone:72 if self.error_func is not None: 73 73 self.error_func("EstimatePr.compute: %s" % sys.exc_value) 74 74 … … 110 110 pass 111 111 except: 112 if not self.error_func isNone:112 if self.error_func is not None: 113 113 self.error_func("EstimatePr2.compute: %s" % sys.exc_value)
Note: See TracChangeset
for help on using the changeset viewer.