Changes in / [7b15990:cfd27dd] in sasview

File:

• src/sas/sascalc/data_util/qsmearing.py (modified) (5 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -5 +5 @@
 #This software was developed by the University of Tennessee as part of the
 #Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#project funded by the US National Science Foundation.
+#project funded by the US National Science Foundation. 
 #See the license text in license.txt
 #copyright 2008, University of Tennessee
@@ -17 +17 @@
 
 from sasmodels.resolution import Slit1D, Pinhole1D
-from sasmodels.sesans import SesansTransform, OrientedSesansTransform
+from sasmodels.sesans import SesansTransform
 from sasmodels.resolution2d import Pinhole2D
 from .nxsunit import Converter
@@ -74 +74 @@
 
         Rmax = 10000000
+        hankel = SesansTransform(data.x, SElength,
+                                 data.source.wavelength,
+                                 zaccept, Rmax)
         # Then return the actual transform, as if it were a smearing function
-        # data must have the isoriented flag here!
-        if getattr(data, 'isoriented', False):
-            costransform = OrientedSesansTransform(data.x, SElength, zaccept, Rmax)
-            return PySmear(costransform, model, offset=0)
-        else:
-            hankel = SesansTransform(data.x, SElength,
-                                     data.source.wavelength, zaccept, Rmax)
-            return PySmear(hankel, model, offset=0)
+        return PySmear(hankel, model, offset=0)
 
     _found_resolution = False
@@ -142 +138 @@
         first_bin:last_bin set to the resolution smeared values.
         """
+        if last_bin is None: last_bin = len(iq_in)
+        start, end = first_bin + self.offset, last_bin + self.offset
         q_calc = self.resolution.q_calc
         iq_calc = np.empty_like(q_calc)
@@ -253 +251 @@
             val = self.model.evalDistribution(q_calc)
             return val
+