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

Timestamp:

Nov 13, 2016 6:04:05 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:

55db501, a5b8253

Parents:

f5e226c9

Message:

Hankel trafo optimized, sesans_reader code cleaned up, hankel matrix constructor
code moved from sasview/qsmearing to sasmodels/sesans

File:

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

src/sas/sascalc/data_util/qsmearing.py

@@ -18 +18 @@
 import numpy as np  # type: ignore
 from numpy import pi, exp  # type: ignore
-from scipy.special import jv as besselj
+#from scipy.special import j as besselj
 
 from sasmodels.resolution import Slit1D, Pinhole1D, SESANS1D
@@ -66 +66 @@
 
     if _found_sesans == True:
-        #Pre-computing the Hankel matrix (H)
-
-        Rmax = 1000000
-        q_calc = sesans.make_q(data.sample.zacceptance, Rmax)
-        SElength = Converter(data._xunit)(data.x, "A")
-        dq = q_calc[1] - q_calc[0]
-        H0 = dq / (2 * pi) * q_calc
-        repSE, repq = np.meshgrid(SElength,q_calc)
-        hankelt=time.time()
-        H = dq / (2 * pi) * besselj(0, np.outer(q_calc, SElength))*repq
-        hankelt=time.time()-hankelt
-        print("Hankel transform took "+str(hankelt)+" s")
+        #Pre-compute the Hankel matrix (H)
+        H0,H, q_calc = sesans.Hankelconstructor(data)
+        # Then return the actual transform, as if it were a smearing function
         return PySmear(SESANS1D(data, H0, H, q_calc), model)