Changeset f845454 in sasview for src/sas/sascalc/dataloader/readers
- Timestamp:
- Dec 19, 2016 1:52:12 PM (8 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- b61bd57
- Parents:
- 99f3e053 (diff), 50f1477 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Jeff Krzywon <krzywon@…> (12/19/16 13:52:12)
- git-committer:
- GitHub <noreply@…> (12/19/16 13:52:12)
- Location:
- src/sas/sascalc/dataloader/readers
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/readers/ascii_reader.py
r7d94915 rd2471870 172 172 input_f.close() 173 173 if not is_data: 174 return None 174 msg = "ascii_reader: x has no data" 175 raise RuntimeError, msg 175 176 # Sanity check 176 177 if has_error_dy == True and not len(ty) == len(tdy): -
src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py
r5e906207 rbbd0f37 162 162 else: 163 163 self.current_dataset.x = data_set.flatten() 164 continue 165 elif key == u'Qdev': 166 self.current_dataset.dx = data_set.flatten() 164 167 continue 165 168 elif key == u'Qy':
Note: See TracChangeset
for help on using the changeset viewer.