Changeset 632e2e8 in sasview for src/sas/sascalc

Timestamp:

Nov 20, 2016 7:54:54 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:

1cad8a4

Parents:

a5b8253 (diff), 4466a6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Jurrian1D_optSESclass' into Jurrian1D_opt

File:

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

src/sas/sascalc/data_util/qsmearing.py

@@ -14 +14 @@
 import sys
 from sasmodels import sesans
-
 import numpy as np  # type: ignore
 from numpy import pi, exp  # type: ignore
-#from scipy.special import jv 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
@@ -60 +59 @@
     # TODO: change other sanity checks to check for file loader instead of data structure?
     _found_sesans = False
-    if data.dx is not None and data.meta_data['loader']=='SESANS':
+    #if data.dx is not None and data.meta_data['loader']=='SESANS':
+    if data.dx is not None and data.isSesans:
         if data.dx[0] > 0.0:
             _found_sesans = True
@@ -66 +66 @@
     if _found_sesans == True:
         #Pre-compute the Hankel matrix (H)
-        H0,H, q_calc = sesans.Hankelconstructor(data)
+        qmax, qunits = data.sample.zacceptance
+        hankel=sesans.SesansTransform()
+        sesans.SesansTransform.set_transform(hankel,
+        SE = Converter(data._xunit)(data.x, "A"),
+        zaccept = Converter(qunits)(qmax, "1/A"),
+        Rmax = 1000000)
         # Then return the actual transform, as if it were a smearing function
-        return PySmear(SESANS1D(data, H0, H, q_calc), model)
+        return PySmear(SESANS1D(data, hankel._H0, hankel._H, hankel.q), model)
 
     _found_resolution = False