- Timestamp:
- Apr 20, 2017 2:58:00 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 7a5d066
- Parents:
- ad92c5a
- git-author:
- Jeff Krzywon <krzywon@…> (04/20/17 14:58:00)
- git-committer:
- krzywon <krzywon@…> (04/20/17 14:58:00)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/readers/ascii_reader.py
rad92c5a r080d88e 14 14 15 15 import logging 16 import numpy as np17 16 from sas.sascalc.dataloader.file_reader_base_class import FileReader 18 17 from sas.sascalc.dataloader.data_info import DataInfo, plottable_1D … … 88 87 89 88 self.current_dataset.x[candidate_lines] = float(toks[0]) 90 self.current_dataset.y[candidate_lines] = float(toks[1]) 89 90 if new_lentoks > 1: 91 self.current_dataset.y[candidate_lines] = float(toks[1]) 91 92 92 93 # If a 3rd row is present, consider it dy
Note: See TracChangeset
for help on using the changeset viewer.