Changeset ef3445e2 in sasview for src/sas/dataloader
- Timestamp:
- Feb 18, 2015 3:28:13 AM (10 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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- ddc192a
- Parents:
- d838715
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/dataloader/readers/ascii_reader.py
r79492222 ref3445e2 67 67 raise RuntimeError, "ascii_reader: cannot open %s" % path 68 68 buff = input_f.read() 69 lines = buff.split('\n') 70 71 #Jae could not find python universal line spliter: 72 #keep the below for now 73 # some ascii data has \r line separator, 74 # try it when the data is on only one long line 75 if len(lines) < 2 : 76 lines = buff.split('\r') 69 lines = buff.splitlines() 77 70 78 71 x = numpy.zeros(0) … … 81 74 dx = numpy.zeros(0) 82 75 83 #temp. space to sort data76 #temp. space to sort data 84 77 tx = numpy.zeros(0) 85 78 ty = numpy.zeros(0) … … 220 213 pass 221 214 222 x = numpy.append(x, _x) 215 x = numpy.append(x, _x) 223 216 y = numpy.append(y, _y) 224 217 … … 294 287 i += 1 295 288 except: 296 297 289 # It is data and meet non - number, then stop reading 298 290 if is_data == True:
Note: See TracChangeset
for help on using the changeset viewer.