Changeset a2573fc in sasview

Timestamp:

Apr 5, 2017 7:40:15 AM (7 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:

• cansas_reader.py (modified) (2 diffs)
• cansas_reader_BACKUP_72072.py (deleted)
• cansas_reader_BASE_72072.py (deleted)
• cansas_reader_LOCAL_72072.py (deleted)
• cansas_reader_REMOTE_72072.py (deleted)

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

@@ -263 +263 @@
                 elif tagname == 'I' and isinstance(self.current_dataset, plottable_1D):
                     unit_list = unit.split("|")
+
                     if len(unit_list) > 1:
                         self.current_dataset.yaxis(unit_list[0].strip(),
@@ -268 +269 @@
                     else:
                         self.current_dataset.yaxis("Intensity", unit)
+
                     self.current_dataset.y = np.append(self.current_dataset.y, data_point)
+                    print data_point
+
                 elif tagname == 'Idev' and isinstance(self.current_dataset, plottable_1D):
                     self.current_dataset.dy = np.append(self.current_dataset.dy, data_point)
+
                 elif tagname == 'Q':
                     unit_list = unit.split("|")