Changeset 9f7fbd9 in sasview for src

Timestamp:

Mar 24, 2015 3:28:54 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

66f21cd

Parents:

0efb04d

Message:

rewrite slit smearing for usans

Location:

src/sas

Files:

• fit/AbstractFitEngine.py (modified) (2 diffs)
• fit/BumpsFitting.py (modified) (2 diffs)
• models/qsmearing.py (modified) (2 diffs)
• models/resolution.py (added)

src/sas/fit/AbstractFitEngine.py

@@ -161 +161 @@
         # TODO: Should provide an option for users to set it like percent,
         # constant, or dy data
-        if dy == None or dy == [] or dy.all() == 0:
+        if dy is None or dy == [] or dy.all() == 0:
             self.dy = numpy.ones(len(y))
         else:
@@ -260 +260 @@
         """
         return []
-    
-    
+
+
 class FitData2D(Data2D):
     """

src/sas/fit/BumpsFitting.py

@@ -107 +107 @@
         self.model = model.model
         self.data = data
+        if self.data.smearer is not None:
+            self.data.smearer.model = self.model
         self._define_pars()
         self._init_pars(kw)
@@ -174 +176 @@
     def _recalculate(self):
         if self._dirty:
-            self._residuals, self._theory = self.data.residuals(self.model.evalDistribution)
+            self._residuals, self._theory \
+                = self.data.residuals(self.model.evalDistribution)
             self._dirty = False
 

src/sas/models/qsmearing.py

@@ -81 +81 @@
     # If we found slit smearing data, return a slit smearer
     if _found_slit == True:
-        return SlitSmearer(data1D, model)
+        return PySlitSmearer(data1D, model)
     return None
             
@@ -583 +583 @@
     return nbins_low, nbins_high, \
              new_width[data_x_ext > 0], data_x_ext[data_x_ext > 0]
+
+
+
+from .resolution import Slit1D
+class PySlitSmearer(object):
+    def __init__(self, data1D, model = None):
+        self.model = model
+
+        q = data1D.x
+        width = data1D.dxw if data1D.dxw is not None else 0
+        height = data1D.dxl if data1D.dxl is not None else 0
+        # TODO: width and height seem to be reversed
+        self.resolution = Slit1D(q, height, width)
+
+    def __call__(self, iq_in, first_bin=0, last_bin=None):
+        if last_bin is None or last_bin >= len(iq_in):
+            last_bin = len(iq_in) - 1
+        q_calc = self.resolution.q_calc
+        iq_calc = numpy.empty_like(q_calc)
+        iq_calc[:first_bin] = 0
+        iq_calc[first_bin:last_bin+1] = iq_in
+        if last_bin < len(q_calc)-1:
+            iq_calc[last_bin:] = self.model.evalDistribution(q_calc[last_bin:])
+        iq_out = self.resolution.apply(iq_calc)
+        return iq_out[first_bin:last_bin+1]
+
+    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
+
+        """
+        # assume the data values are sorted
+        first = numpy.searchsorted(self.resolution.q, q_min)
+        # assume that the resolution is much larger than the q range
+        last = len(self.resolution.q)-1
+        return first, last