Changeset e123eb9 in sasview

Timestamp:

May 17, 2017 4:53:56 PM (8 years ago)

Author:

Ricardo M. Ferraz Leal <ricleal@…>

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:

46cd1c3

Parents:

5e903e8b

Message:

Test only for the log binning

File:

• test/sasdataloader/test/utest_averaging.py (modified) (2 diffs)

test/sasdataloader/test/utest_averaging.py

@@ -3 +3 @@
 import os
 import unittest
-
+from scipy.stats import binned_statistic_2d
 import numpy as np
 
@@ -264 +264 @@
             self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
 
+    def test_sectorq_log(self):
+        """
+            Test sector averaging I(q)
+            The test data was not generated by IGOR.
+        """
+
+        r = SectorQ(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi / 2.0, base=10)
+        r.nbins_phi = 20
+        o = r(self.data)
+
+        expected_binning = np.logspace(np.log10(0.005), np.log10(0.01), 20, base=10)
+        for i in range(len(o.x)):
+            self.assertAlmostEqual(o.x[i], expected_binning[i], 3)
+        
+        # TODO: Test for Y values (o.y)
+        # print len(self.data.x_bins)
+        # print len(self.data.y_bins)
+        # print self.data.q_data.shape
+        # data_to_bin = np.array(self.data.q_data)
+        # data_to_bin = data_to_bin.reshape(len(self.data.x_bins), len(self.data.y_bins))
+        # H, xedges, yedges, binnumber = binned_statistic_2d(self.data.x_bins, self.data.y_bins, data_to_bin,
+        #     bins=[[0, math.pi / 2.0], expected_binning], statistic='mean')
+        # xedges_width = (xedges[1] - xedges[0])
+        # xedges_center = xedges[1:] - xedges_width / 2
+        
+        # yedges_width = (yedges[1] - yedges[0])
+        # yedges_center = yedges[1:] - yedges_width / 2
+        
+        # print H.flatten().shape
+        # print o.y.shape
+        
 
 if __name__ == '__main__':