Changeset 235f514 in sasview for src/sas/sasgui/guiframe/dataFitting.py
- Timestamp:
- Apr 9, 2017 3:46:10 AM (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:
- ac07a3a
- Parents:
- 5b2b04d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/guiframe/dataFitting.py
r959eb01 r235f514 78 78 result.clone_without_data(length=len(self.x), clone=self) 79 79 result.copy_from_datainfo(data1d=self) 80 if self.dxw ==None:80 if self.dxw is None: 81 81 result.dxw = None 82 82 else: 83 83 result.dxw = np.zeros(len(self.x)) 84 if self.dxl ==None:84 if self.dxl is None: 85 85 result.dxl = None 86 86 else: … … 125 125 tot_length = len(self.x) + len(other.x) 126 126 result = self.clone_without_data(length=tot_length, clone=result) 127 if self.dlam ==None or other.dlam is None:127 if self.dlam is None or other.dlam is None: 128 128 result.dlam = None 129 129 else: 130 130 result.dlam = np.zeros(tot_length) 131 if self.dy ==None or other.dy is None:131 if self.dy is None or other.dy is None: 132 132 result.dy = None 133 133 else: 134 134 result.dy = np.zeros(tot_length) 135 if self.dx ==None or other.dx is None:135 if self.dx is None or other.dx is None: 136 136 result.dx = None 137 137 else: 138 138 result.dx = np.zeros(tot_length) 139 if self.dxw ==None or other.dxw is None:139 if self.dxw is None or other.dxw is None: 140 140 result.dxw = None 141 141 else: 142 142 result.dxw = np.zeros(tot_length) 143 if self.dxl ==None or other.dxl is None:143 if self.dxl is None or other.dxl is None: 144 144 result.dxl = None 145 145 else: … … 227 227 result = self.clone_without_data(len(self.x)) 228 228 result.copy_from_datainfo(data1d=self) 229 if self.dxw ==None:229 if self.dxw is None: 230 230 result.dxw = None 231 231 else: 232 232 result.dxw = np.zeros(len(self.x)) 233 if self.dxl ==None:233 if self.dxl is None: 234 234 result.dxl = None 235 235 else: … … 279 279 tot_length = len(self.x)+len(other.x) 280 280 result.clone_without_data(length=tot_length, clone=self) 281 if self.dlam ==None or other.dlam is None:281 if self.dlam is None or other.dlam is None: 282 282 result.dlam = None 283 283 else: 284 284 result.dlam = np.zeros(tot_length) 285 if self.dy ==None or other.dy is None:285 if self.dy is None or other.dy is None: 286 286 result.dy = None 287 287 else: 288 288 result.dy = np.zeros(tot_length) 289 if self.dx ==None or other.dx is None:289 if self.dx is None or other.dx is None: 290 290 result.dx = None 291 291 else: 292 292 result.dx = np.zeros(tot_length) 293 if self.dxw ==None or other.dxw is None:293 if self.dxw is None or other.dxw is None: 294 294 result.dxw = None 295 295 else: 296 296 result.dxw = np.zeros(tot_length) 297 if self.dxl ==None or other.dxl is None:297 if self.dxl is None or other.dxl is None: 298 298 result.dxl = None 299 299 else: … … 405 405 result.ymin = self.ymin 406 406 result.ymax = self.ymax 407 if self.dqx_data == None or self.dqy_data ==None:407 if self.dqx_data is None or self.dqy_data is None: 408 408 result.dqx_data = None 409 409 result.dqy_data = None … … 468 468 result.ymin = self.ymin 469 469 result.ymax = self.ymax 470 if self.dqx_data == None or self.dqy_data ==None or \471 other.dqx_data == None or other.dqy_data ==None :470 if self.dqx_data is None or self.dqy_data is None or \ 471 other.dqx_data is None or other.dqy_data is None : 472 472 result.dqx_data = None 473 473 result.dqy_data = None
Note: See TracChangeset
for help on using the changeset viewer.