Changeset 157b716 in sasview for src/sas/sascalc

Timestamp:

Feb 6, 2017 5:02:46 PM (8 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

68adf86

Parents:

ad4632c

Message:

simplify interface to sesans transform

File:

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

src/sas/sascalc/data_util/qsmearing.py

@@ -13 +13 @@
 import logging
 import sys
-from sasmodels import sesans
 import numpy as np  # type: ignore
 from numpy import pi, exp # type:ignore
 from sasmodels.resolution import Slit1D, Pinhole1D
-from sasmodels.sesans import SESANS1D
+from sasmodels.sesans import SesansTransform
 from sasmodels.resolution2d import Pinhole2D
 from src.sas.sascalc.data_util.nxsunit import Converter
@@ -68 +67 @@
         #Pre-compute the Hankel matrix (H)
         qmax, qunits = data.sample.zacceptance
-        hankel = sesans.SesansTransform(SE=Converter(data._xunit)(data.x, "A"),
-                                        zaccept=Converter(qunits)(qmax, "1/A"),
-                                        Rmax=10000000)
+        SElength = Converter(data._xunit)(data.x, "A")
+        zaccept = Converter(qunits)(qmax, "1/A"),
+        Rmax = 10000000
+        hankel = SesansTransform(data.x, SElength, zaccept, Rmax)
         # Then return the actual transform, as if it were a smearing function
-        return PySmear(SESANS1D(data, hankel.H0, hankel.H, hankel.q), model)
+        return PySmear(hankel, model, offset=0)
 
     _found_resolution = False
@@ -115 +115 @@
     Wrapper for pure python sasmodels resolution functions.
     """
-    def __init__(self, resolution, model):
+    def __init__(self, resolution, model, offset=None):
         self.model = model
         self.resolution = resolution
-
-        if hasattr(self.resolution, 'data'):
-            #if self.resolution.data.meta_data['loader'] == 'SESANS':  # Always True if file extension is '.ses'!
-            if self.resolution.data.isSesans:
-                self.offset = 0
-            # This is default behaviour, for future resolution/transform functions this needs to be revisited.
-            else:
-                self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
-        else:
-            self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
-
-        # self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
+        if offset is None:
+            offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
+        self.offset = offset
 
     def apply(self, iq_in, first_bin=0, last_bin=None):