Changeset fd5ac0d in sasview for src/sas/perspectives
- Timestamp:
- Feb 13, 2015 5:26:52 AM (10 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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 7a04dbb
- Parents:
- b9a5f0e
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/perspectives/fitting/fitting.py
rb9a5f0e rfd5ac0d 51 51 52 52 MAX_NBR_DATA = 4 53 SA NS_F_TOL = 5e-0553 SAS_F_TOL = 5e-05 54 54 55 55 (PageInfoEvent, EVT_PAGE_INFO) = wx.lib.newevent.NewEvent() … … 94 94 self._gui_engine = None 95 95 ## Relative error desired in the sum of squares (float); scipy only 96 self.ftol = SA NS_F_TOL96 self.ftol = SAS_F_TOL 97 97 self.batch_reset_flag = True 98 98 #List of selected data … … 291 291 msg += "Please manually remove the files (.py, .pyc) " 292 292 msg += "in the 'plugin_models' folder \n" 293 msg += "inside of the Sa nsView application, "293 msg += "inside of the SasView application, " 294 294 msg += "and try it again." 295 295 wx.MessageBox(msg, 'Info') … … 817 817 except: 818 818 # default 819 f_tol = SA NS_F_TOL819 f_tol = SAS_F_TOL 820 820 821 821 self.ftol = f_tol … … 1373 1373 if model is not None and hasattr(model, "model"): 1374 1374 model = model.model 1375 if data is not None and hasattr(data, "sa ns_data"):1376 data = data.sa ns_data1375 if data is not None and hasattr(data, "sas_data"): 1376 data = data.sas_data 1377 1377 1378 1378 is_data2d = issubclass(data.__class__, Data2D)
Note: See TracChangeset
for help on using the changeset viewer.