Changeset 5859862 in sasview for DataLoader/qsmearing.py

Timestamp:

Sep 20, 2009 5:41:40 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

a65ffcb

Parents:

a1100c07

Message:

dataloader: fixed problem with uneven binning. Added utility method to get first and last bins in unsmeared q.

File:

• DataLoader/qsmearing.py (modified) (6 diffs)

DataLoader/qsmearing.py

@@ -12 +12 @@
 import numpy
 import math
+import logging, sys
 import scipy.special
 
@@ -99 +100 @@
         
     def _compute_matrix(self): return NotImplemented
+
+    def get_bin_range(self, q_min=None, q_max=None):
+        """
+            @param q_min: minimum q-value to smear
+            @param q_max: maximum q-value to smear 
+        """
+        if q_min == None:
+            q_min = self.min
+        
+        if q_max == None:
+            q_max = self.max
+        
+        _qmin_unsmeared, _qmax_unsmeared = self.get_unsmeared_range(q_min, q_max)
+        
+        _first_bin = None
+        _last_bin  = None
+
+        step = (self.max-self.min)/(self.nbins-1.0)
+        for i in range(self.nbins):
+            q_i = smearer.get_q(self._smearer, i)
+            if (q_i >= _qmin_unsmeared) and (q_i <= _qmax_unsmeared):
+                # Identify first and last bin
+                if _first_bin is None:
+                    _first_bin = i
+                else:
+                    _last_bin  = i
+               
+        return _first_bin, _last_bin
 
     def __call__(self, iq_in, first_bin=0, last_bin=None):
@@ -161 +190 @@
             This method HAS to be called before smearing
         """
-        self._smearer = smearer.new_slit_smearer(self.width, self.height, self.min, self.max, self.nbins)
+        #self._smearer = smearer.new_slit_smearer(self.width, self.height, self.min, self.max, self.nbins)
+        self._smearer = smearer.new_slit_smearer_with_q(self.width, self.height, self.qvalues)
         self._init_complete = True
 
+    def get_unsmeared_range(self, q_min, q_max):
+        """
+            Determine the range needed in unsmeared-Q to cover
+            the smeared Q range
+        """
+        # Range used for input to smearing
+        _qmin_unsmeared = q_min
+        _qmax_unsmeared = q_max 
+        try:
+            _qmin_unsmeared = self.min
+            _qmax_unsmeared = self.max
+        except:
+            logging.error("_SlitSmearer.get_bin_range: %s" % sys.exc_value)
+        return _qmin_unsmeared, _qmax_unsmeared
 
 class SlitSmearer(_SlitSmearer):
@@ -199 +243 @@
         self.nbins = len(data1D.x)
         ## Minimum Q 
-        self.min = data1D.x[0]
+        self.min = min(data1D.x)
         ## Maximum
-        self.max = data1D.x[len(data1D.x)-1]        
-
-        #print "nbin,npts",self.nbins,self.npts
+        self.max = max(data1D.x)
+        ## Q-values
+        self.qvalues = data1D.x
+        
 
 class _QSmearer(_BaseSmearer):
@@ -236 +281 @@
             This method HAS to be called before smearing
         """
-        self._smearer = smearer.new_q_smearer(numpy.asarray(self.width), self.min, self.max, self.nbins)
+        #self._smearer = smearer.new_q_smearer(numpy.asarray(self.width), self.min, self.max, self.nbins)
+        self._smearer = smearer.new_q_smearer_with_q(numpy.asarray(self.width), self.qvalues)
         self._init_complete = True
+        
+    def get_unsmeared_range(self, q_min, q_max):
+        """
+            Determine the range needed in unsmeared-Q to cover
+            the smeared Q range
+            Take 3 sigmas as the offset between smeared and unsmeared space
+        """
+        # Range used for input to smearing
+        _qmin_unsmeared = q_min
+        _qmax_unsmeared = q_max 
+        try:
+            offset = 3.0*max(self.width)
+            _qmin_unsmeared = max([self.min, q_min-offset])
+            _qmax_unsmeared = min([self.max, q_max+offset])
+        except:
+            logging.error("_QSmearer.get_bin_range: %s" % sys.exc_value)
+        return _qmin_unsmeared, _qmax_unsmeared
+        
+        
         
 class QSmearer(_QSmearer):
@@ -260 +325 @@
         self.nbins = len(data1D.x)
         ## Minimum Q 
-        self.min = data1D.x[0]
+        self.min = min(data1D.x)
         ## Maximum
-        self.max = data1D.x[len(data1D.x)-1]        
+        self.max = max(data1D.x)
+        ## Q-values
+        self.qvalues = data1D.x