Changeset a01af35 in sasview for src/sas/sascalc

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

Location:

src/sas/sascalc

Files:

• data_util/qsmearing.py (modified) (2 diffs)
• dataloader/readers/sesans_reader.py (modified) (4 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)
 

src/sas/sascalc/dataloader/readers/sesans_reader.py

@@ -59 +59 @@
                     raise  RuntimeError, "sesans_reader: cannot open %s" % path
                 buff = input_f.read()
-#                print buff
                 lines = buff.splitlines()
-#                print lines
-                #Jae could not find python universal line spliter:
-                #keep the below for now
-                # some ascii data has \r line separator,
-                # try it when the data is on only one long line
-#                if len(lines) < 2 :
-#                    lines = buff.split('\r')
-                 
                 x  = numpy.zeros(0)
                 y  = numpy.zeros(0)
@@ -83 +74 @@
                 tdlam = numpy.zeros(0)
                 tdx = numpy.zeros(0)
-#                print "all good"
                 output = Data1D(x=x, y=y, lam=lam, dy=dy, dx=dx, dlam=dlam, isSesans=True )
-#                print output                
                 self.filename = output.filename = basename
 
-#                #Initialize counters for data lines and header lines.
-#                is_data = False  # Has more than 5 lines
-#                # More than "5" lines of data is considered as actual
-#                # data unless that is the only data
-#                mum_data_lines = 5
-#                # To count # of current data candidate lines
-#                i = -1
-#                # To count total # of previous data candidate lines
-#                i1 = -1
-#                # To count # of header lines
-#                j = -1
-#                # Helps to count # of header lines
-#                j1 = -1
-#                #minimum required number of columns of data; ( <= 4).
-#                lentoks = 2
                 paramnames=[]
                 paramvals=[]
@@ -111 +85 @@
                 Pvals=[]
                 dPvals=[]
-#                print x
-#                print zvals
                 for line in lines:
                     # Initial try for CSV (split on ,)
@@ -121 +93 @@
                         paramvals.append(toks[1])
                     if len(toks)>5:
-                       #zvals.append(toks[0])
-                        #dzvals.append(toks[1])
-                        #lamvals.append(toks[2])
-                        #dlamvals.append(toks[3])
-                        #Pvals.append(toks[4])
-                        #dPvals.append(toks[5])
-
                         zvals.append(toks[0])
                         dzvals.append(toks[3])