Changeset 7432acb in sasview for src/sas/sasgui/guiframe/dataFitting.py
- Timestamp:
- Apr 9, 2017 6:11:31 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:
- 45dffa69
- Parents:
- ac07a3a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/guiframe/dataFitting.py
r235f514 r7432acb 154 154 result.lam = np.append(self.lam, other.lam) 155 155 result.lam = result.lam[ind] 156 if result.dlam !=None:156 if result.dlam is not None: 157 157 result.dlam = np.append(self.dlam, other.dlam) 158 158 result.dlam = result.dlam[ind] 159 if result.dy !=None:159 if result.dy is not None: 160 160 result.dy = np.append(self.dy, other.dy) 161 161 result.dy = result.dy[ind] … … 307 307 result.lam = np.append(self.lam, other.lam) 308 308 result.lam = result.lam[ind] 309 if result.dy !=None:309 if result.dy is not None: 310 310 result.dy = np.append(self.dy, other.dy) 311 311 result.dy = result.dy[ind]
Note: See TracChangeset
for help on using the changeset viewer.