Changeset 4581ac9 in sasview

Timestamp:

Nov 9, 2016 1:58:30 PM (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:

f5e226c9

Parents:

9087214

Message:

Experimenting with optimization to Hankel trafo

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (6 diffs)
• sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -15 +15 @@
 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.resolution2d import Pinhole2D
+from src.sas.sascalc.data_util.nxsunit import Converter
+
 
 def smear_selection(data, model = None):
@@ -37 +43 @@
     # Sanity check. If we are not dealing with a SAS Data1D
     # object, just return None
+
+    # This checks for 2D data (does not throw exception because fail is common)
     if  data.__class__.__name__ not in ['Data1D', 'Theory1D']:
         if data == None:
@@ -43 +51 @@
             return None
         return Pinhole2D(data)
-
+    # This checks for 1D data with smearing info in the data itself (again, fail is likely; no exceptions)
     if  not hasattr(data, "dx") and not hasattr(data, "dxl")\
          and not hasattr(data, "dxw"):
@@ -49 +57 @@
 
     # Look for resolution smearing data
+    # This is the code that checks for SESANS data; it looks for the file loader
+    # 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':
@@ -55 +65 @@
 
     if _found_sesans == True:
-        return sesans_smear(data, model)
+        #Pre-computing the Hankel matrix
+        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
+        H = dq / (2 * pi) * besselj(0, np.outer(q_calc, SElength))
+
+        return PySmear(SESANS1D(data, H0, H, q_calc), model)
 
     _found_resolution = False
@@ -169 +187 @@
     Rmax = 1000000
     q_calc = sesans.make_q(data.sample.zacceptance, Rmax)
-    return PySmear(SESANS1D(data,q_calc),model)
+    SElength=Converter(data._xunit)(data.x, "A")
+    #return sesans.HankelTransform(q_calc, SElength)
+    #Old return statement, running through the smearer
+    #return PySmear(SESANS1D(data,q_calc),model)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -229 +229 @@
             self.set_data(data)
         elif self.dataSource.GetCount() > 0:
+
             pos = self.dataSource.GetSelection()
             data = self.dataSource.GetClientData(pos)