Changeset 590b5c2 in sasview for src/sas/sascalc


Ignore:
Timestamp:
Sep 15, 2017 12:01:21 PM (7 years ago)
Author:
krzywon
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
da9b239
Parents:
e56f335
Message:

Load dxl and dxw data in the same way x, y, dx, and dy are to ensure array lengths are the same. refs #994

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sascalc/dataloader/readers/cansas_reader.py

    rc54c965 r590b5c2  
    285285                    self.current_dataset.dx = np.append(self.current_dataset.dx, data_point) 
    286286                elif tagname == 'dQw': 
    287                     if self.current_dataset.dxw is None: 
    288                         self.current_dataset.dxw = np.empty(0) 
    289                     self.current_dataset.dxw = np.append(self.current_dataset.dxw, data_point) 
     287                   self.current_dataset.dxw = np.append(self.current_dataset.dxw, data_point) 
    290288                elif tagname == 'dQl': 
    291                     if self.current_dataset.dxl is None: 
    292                         self.current_dataset.dxl = np.empty(0) 
    293289                    self.current_dataset.dxl = np.append(self.current_dataset.dxl, data_point) 
    294290                elif tagname == 'Qmean': 
Note: See TracChangeset for help on using the changeset viewer.