Changeset a2573fc in sasview


Ignore:
Timestamp:
Apr 5, 2017 7:40:15 AM (2 years ago)
Author:
Tim Snow <tim.snow@…>
Children:
65e61c1
Parents:
3d6c010
Message:

Sorted out conflicts after merging

As in title

Location:
src/sas/sascalc/dataloader/readers
Files:
4 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/readers/cansas_reader.py

    r3d6c010 ra2573fc  
    263263                elif tagname == 'I' and isinstance(self.current_dataset, plottable_1D): 
    264264                    unit_list = unit.split("|") 
     265 
    265266                    if len(unit_list) > 1: 
    266267                        self.current_dataset.yaxis(unit_list[0].strip(), 
     
    268269                    else: 
    269270                        self.current_dataset.yaxis("Intensity", unit) 
     271 
    270272                    self.current_dataset.y = np.append(self.current_dataset.y, data_point) 
     273                    print data_point 
     274 
    271275                elif tagname == 'Idev' and isinstance(self.current_dataset, plottable_1D): 
    272276                    self.current_dataset.dy = np.append(self.current_dataset.dy, data_point) 
     277 
    273278                elif tagname == 'Q': 
    274279                    unit_list = unit.split("|") 
Note: See TracChangeset for help on using the changeset viewer.