Changeset 168d359 in sasview

Timestamp:

Apr 8, 2017 7:54:23 AM (8 years ago)

Author:

Ricardo 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:

c0ca2e3d

Parents:

fa4af76

Message:

Log binnning working for SectorQ

Files:

• run.py (modified) (1 diff)
• src/sas/sascalc/dataloader/manipulations.py (modified) (7 diffs)

run.py

@@ -62 +62 @@
 def import_package(modname, path):
     """Import a package into a particular point in the python namespace"""
+    logger.debug("Dynamicly importing: %s", path)
     mod = imp.load_source(modname, abspath(joinpath(path,'__init__.py')))
     sys.modules[modname] = mod

src/sas/sascalc/dataloader/manipulations.py

@@ -4 +4 @@
 Using the meta data information, various types of averaging
 are performed in Q-space
+
+To test this module use:
+```
+cd test
+PYTHONPATH=../src/ python2  -m sasdataloader.test.utest_averaging DataInfoTests.test_sectorphi_quarter
+```
 """
 #####################################################################
@@ -13 +19 @@
 ######################################################################
 
-# If you want to run just a single test from this file:
-# PYTHONPATH=../src/ python2  -m sasdataloader.test.utest_averaging data_info_tests.test_sectorq_full
+
 # TODO: copy the meta data from the 2D object to the resulting 1D object
 import math
 import numpy as np
-
+import sys
+ 
 #from data_info import plottable_2D
 from data_info import Data1D
@@ -266 +272 @@
 ################################################################################
 
+class Binning(object):
+    '''
+    This class just creates a binning object
+    either linear or log
+    '''
+
+    def __init__(self, min_value, max_value, n_bins, base=None):
+        '''
+        if base is None: Linear binning
+        '''
+        self.min = min_value if min_value > 0 else 0.0001
+        self.max = max_value
+        self.n_bins = n_bins
+        self.base = base
+
+    def get_bin_index(self, value):
+        '''
+        The general formula logarithm binning is:
+        bin = floor(N * (log(x) - log(min)) / (log(max) - log(min)))
+        '''
+        if self.base:
+            temp_x = self.n_bins * (math.log(value, self.base) - math.log(self.min, self.base))
+            temp_y = math.log(self.max, self.base) - math.log(self.min, self.base)
+        else:
+            temp_x = self.n_bins * (value - self.min)
+            temp_y = self.max - self.min
+        # Bin index calulation
+        return int(math.floor(temp_x / temp_y))
+
+
+################################################################################
+
 class _Slab(object):
     """
@@ -765 +803 @@
     """
 
-    def __init__(self, r_min, r_max, phi_min=0, phi_max=2 * math.pi, nbins=20):
+    def __init__(self, r_min, r_max, phi_min=0, phi_max=2 * math.pi, nbins=20, base = None):
         self.r_min = r_min
         self.r_max = r_max
@@ -771 +809 @@
         self.phi_max = phi_max
         self.nbins = nbins
+        self.base = base
 
     def _agv(self, data2D, run='phi'):
@@ -805 +844 @@
         phi_min = flip_phi(self.phi_min)
         phi_max = flip_phi(self.phi_max)
-
+        
+        #  binning object
+        if run.lower() == 'phi':
+            binning = Binning(self.phi_min, self.phi_max, self.nbins, self.base)
+        else:
+            binning = Binning(self.r_min, self.r_max, self.nbins, self.base)
+        
         for n in range(len(data)):
 
@@ -848 +893 @@
             if not is_in:
                 continue
-        
-            # Check which type of averaging we need
+
+            # Get the binning index
             if run.lower() == 'phi':
-                temp_x = (self.nbins) * (phi_value - self.phi_min)
-                temp_y = (self.phi_max - self.phi_min)
+                i_bin = binning.get_bin_index(phi_value)
             else:
-                temp_x = (self.nbins) * (q_value - self.r_min)
-                temp_y = (self.r_max - self.r_min)
-            # Bin index calulation
-            i_bin = int(math.floor(temp_x / temp_y))
+                i_bin = binning.get_bin_index(q_value)
 
             # Take care of the edge case at phi = 2pi.