Changeset ef3445e2 in sasview

Timestamp:

Feb 18, 2015 5:28:13 AM (9 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:

ddc192a

Parents:

d838715

Message:

Fixed the failing test associated with data loading and sector averaging
in utest_averaging.py. The ascii data loader throws out values where q=0
but the calculator does not resulting causing the first issue. The 2nd
issue was invalid starting and ending points in the sector calculation.

Files:

• src/sas/dataloader/readers/ascii_reader.py (modified) (4 diffs)
• test/sasdataloader/test/utest_averaging.py (modified) (2 diffs)

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:

test/sasdataloader/test/utest_averaging.py

@@ -105 +105 @@
         r = Ring(r_min=.005, r_max=.01, 
                  center_x=self.data.detector[0].beam_center.x, 
-                 center_y=self.data.detector[0].beam_center.y)
-        r.nbins_phi = 20
+                 center_y=self.data.detector[0].beam_center.y,
+                 nbins = 20)
+        ##r.nbins_phi = 20
         
         o = r(self.data)
         answer = Loader().load('ring_testdata.txt')
-        for i in range(r.nbins_phi):
-            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
-            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
-            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+        
+        for i in range(r.nbins_phi - 1):
+            self.assertAlmostEqual(o.x[i + 1], answer.x[i], 4)
+            self.assertAlmostEqual(o.y[i + 1], answer.y[i], 4)
+            self.assertAlmostEqual(o.dy[i + 1], answer.dy[i], 4)
             
     def test_circularavg(self):
@@ -194 +196 @@
         import math
         
-        r = SectorPhi(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi*2.0)
-        r.nbins_phi = 20
+        r = SectorPhi(r_min=.005,
+                      r_max=.01,
+                      phi_min=0.15707963,
+                      phi_max=math.pi*2.-0.15707963,
+                      nbins=19)
         o = r(self.data)