Changeset ba91f71 in sasview for src/sas/sascalc/data_util

Timestamp:

Apr 10, 2017 9:37:39 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

9f59333

Parents:

3fd3c3a3

Message:

oriented sesans: set up smearer as a 1D smearer for 2D data (won't work yet)

File:

• src/sas/sascalc/data_util/qsmearing.py (modified) (4 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
@@ -18 +18 @@
 
 from sasmodels.resolution import Slit1D, Pinhole1D
-from sasmodels.sesans import SesansTransform
+from sasmodels.sesans import SesansTransform, OrientedSesansTransform
 from sasmodels.resolution2d import Pinhole2D
 from .nxsunit import Converter
@@ -73 +73 @@
         Rmax = 10000000
         # data must have the isoriented flag here!
-        coshankel = SesansTransform(data.x, SElength, zaccept, Rmax)
         # Then return the actual transform, as if it were a smearing function
-        if data.isoriented:
-            return PySmear2D(coshankel)
+        if getattr(data, 'isoriented', False):
+            costransform = OrientedSesansTransform(data.x, SElength, zaccept, Rmax)
+            return PySmear(costransform, model, offset=0)
         else:
-            return PySmear(coshankel, model, offset=0)
+            hankel = SesansTransform(data.x, SElength, zaccept, Rmax)
+            return PySmear(hankel, model, offset=0)
 
     _found_resolution = False
@@ -138 +139 @@
         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 = numpy.empty_like(q_calc)
-        if start > 0:
-            iq_calc[:start] = self.model.evalDistribution(q_calc[:start])
-        if end+1 < len(q_calc):
-            iq_calc[end+1:] = self.model.evalDistribution(q_calc[end+1:])
-        iq_calc[start:end+1] = iq_in[first_bin:last_bin+1]
+        if isinstance(q_calc, tuple):
+            # We are 2D -> 1D!
+            iq_calc = self.model.evalDistribution(q_calc)
+        else:
+            if last_bin is None: last_bin = len(iq_in)
+            start, end = first_bin + self.offset, last_bin + self.offset
+            iq_calc = numpy.empty_like(q_calc)
+            if start > 0:
+                iq_calc[:start] = self.model.evalDistribution(q_calc[:start])
+            if end+1 < len(q_calc):
+                iq_calc[end+1:] = self.model.evalDistribution(q_calc[end+1:])
+            iq_calc[start:end+1] = iq_in[first_bin:last_bin+1]
         smeared = self.resolution.apply(iq_calc)
         return smeared