Changeset 53df2ea in sasview for src

Timestamp:

Feb 18, 2015 5:31:30 AM (10 years ago)

Author:

krzywon

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:

a10364b, 42811b8, 66f21cd, 6f82ba1

Parents:

ddc192a (diff), 25ab07c (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview/

Location:

src/sas

Files:

• models/media/list-of-links.txt (added)
• dataloader/manipulations.py (modified) (1 diff)
• dataloader/readers/ascii_reader.py (modified) (4 diffs)

src/sas/dataloader/manipulations.py

@@ -623 +623 @@
         phi_values = numpy.zeros(self.nbins_phi)
         phi_err    = numpy.zeros(self.nbins_phi)
-        
-        # Shift to apply to calculated phi values in order to center first bin at zero
-        phi_shift = Pi / self.nbins_phi
+    
+        # Shift to apply to calculated phi values in order to center first bin at zero
+        phi_shift = Pi / self.nbins_phi
 
         for npt in range(len(data)):

src/sas/dataloader/readers/ascii_reader.py

@@ -67 +67 @@
                     raise  RuntimeError, "ascii_reader: cannot open %s" % path
                 buff = input_f.read()
-                lines = buff.split('\n')
-                
-                #Jae could not find python universal line spliter:
-                #keep the below for now
-                # some ascii data has \r line separator,
-                # try it when the data is on only one long line
-                if len(lines) < 2 :
-                    lines = buff.split('\r')
+                lines = buff.splitlines()
                  
                 x  = numpy.zeros(0)
@@ -81 +74 @@
                 dx = numpy.zeros(0)
                 
-               #temp. space to sort data
+                #temp. space to sort data
                 tx  = numpy.zeros(0)
                 ty  = numpy.zeros(0)
@@ -220 +213 @@
                                 pass
                             
-                        x = numpy.append(x, _x) 
+                        x = numpy.append(x, _x)
                         y = numpy.append(y, _y)
                         
@@ -294 +287 @@
                         i += 1
                     except:
-
                         # It is data and meet non - number, then stop reading
                         if is_data == True: