Changeset e4078ed in sasview

Timestamp:

Nov 20, 2016 5:32:48 AM (8 years ago)

Author:

jhbakker

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:

4466a6a

Parents:

55db501

Message:

Sesans optimization

File:

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

src/sas/sascalc/data_util/qsmearing.py

@@ -17 +17 @@
 import numpy as np  # type: ignore
 from numpy import pi, exp  # type: ignore
-#from scipy.special import j as besselj
 
-from sasmodels.resolution import Slit1D, Pinhole1D, SESANS1D
+from sasmodels.resolution import Slit1D, Pinhole1D
+from sasmodels.sesans import SESANS1D
 from sasmodels.resolution2d import Pinhole2D
 from src.sas.sascalc.data_util.nxsunit import Converter
@@ -68 +68 @@
         #Pre-compute the Hankel matrix (H)
         qmax, qunits = data.sample.zacceptance
-        Hankelinst=sesans.SesansTransform()
-        sesans.SesansTransform.set_transform(Hankelinst,
+        hankel=sesans.SesansTransform()
+        sesans.SesansTransform.set_transform(hankel,
         SE = Converter(data._xunit)(data.x, "A"),
         zaccept = Converter(qunits)(qmax, "1/A"),
         Rmax = 1000000)
-        H=sesans.SesansTransform._H
-        H0=sesans.SesansTransform._H0
-        q=sesans.SesansTransform.q
         # Then return the actual transform, as if it were a smearing function
         # applying evalDistribution to a model, with a q-space as param, returns the I(q) values that go with the q-values
 
-        return PySmear(SESANS1D(data, H0, H, q), model)
+        return PySmear(SESANS1D(data, hankel._H0, hankel._H, hankel.q), model)
 
     _found_resolution = False