Changeset f5e226c9 in sasview for src

Timestamp:

Nov 10, 2016 10:40:33 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:

a01af35

Parents:

4581ac9

Message:

Correct implementation of fast SESANS fitting

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (3 diffs)
• sasgui/plottools/PlotPanel.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -13 +13 @@
 import logging
 import sys
+import time
 from sasmodels import sesans
 
@@ -65 +66 @@
 
     if _found_sesans == True:
-        #Pre-computing the Hankel matrix
+        #Pre-computing the Hankel matrix (H)
+
         Rmax = 1000000
         q_calc = sesans.make_q(data.sample.zacceptance, Rmax)
@@ -71 +73 @@
         dq = q_calc[1] - q_calc[0]
         H0 = dq / (2 * pi) * q_calc
-        H = dq / (2 * pi) * besselj(0, np.outer(q_calc, SElength))
-
+        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")
         return PySmear(SESANS1D(data, H0, H, q_calc), model)
 

src/sas/sasgui/plottools/PlotPanel.py

@@ -97 +97 @@
     """
     def __init__(self, parent, id=-1, xtransform=None,
-                 ytransform=None, scale='log_{10}',
+                 ytransform=None, scale='log_10',
                  color=None, dpi=None, **kwargs):
         """