Changeset 9a5097c in sasview for src/sas/sasgui/perspectives/fitting/pagestate.py
- Timestamp:
- Mar 26, 2017 9:33:16 PM (7 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:
- ed2276f
- Parents:
- 9146ed9
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/pagestate.py
rd5aff7f r9a5097c 18 18 import copy 19 19 import logging 20 import numpy 20 import numpy as np 21 21 import traceback 22 22 … … 410 410 for fittable, name, value, _, uncert, lower, upper, units in params: 411 411 if not value: 412 value = n umpy.nan412 value = np.nan 413 413 if not uncert or uncert[1] == '' or uncert[1] == 'None': 414 414 uncert[0] = False 415 uncert[1] = n umpy.nan415 uncert[1] = np.nan 416 416 if not upper or upper[1] == '' or upper[1] == 'None': 417 417 upper[0] = False 418 upper[1] = n umpy.nan418 upper[1] = np.nan 419 419 if not lower or lower[1] == '' or lower[1] == 'None': 420 420 lower[0] = False 421 lower[1] = n umpy.nan421 lower[1] = np.nan 422 422 if is_string: 423 423 p[name] = str(value) … … 449 449 lower = params.get(name + ".lower", '-inf') 450 450 units = params.get(name + ".units") 451 if std is not None and std is not n umpy.nan:451 if std is not None and std is not np.nan: 452 452 std = [True, str(std)] 453 453 else: 454 454 std = [False, ''] 455 if lower is not None and lower is not n umpy.nan:455 if lower is not None and lower is not np.nan: 456 456 lower = [True, str(lower)] 457 457 else: 458 458 lower = [True, '-inf'] 459 if upper is not None and upper is not n umpy.nan:459 if upper is not None and upper is not np.nan: 460 460 upper = [True, str(upper)] 461 461 else: … … 1100 1100 % (line, tagname, name)) 1101 1101 logging.error(msg + traceback.format_exc()) 1102 dic[name] = n umpy.array(value_list)1102 dic[name] = np.array(value_list) 1103 1103 setattr(self, varname, dic) 1104 1104
Note: See TracChangeset
for help on using the changeset viewer.