Changeset 55db501 in sasview for src/sas/sascalc

Timestamp:

Nov 20, 2016 3:36:43 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:

e4078ed

Parents:

a01af35

Message:

test branch for SESANS class in sesans.py

File:

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

src/sas/sascalc/data_util/qsmearing.py

@@ -15 +15 @@
 import time
 from sasmodels import sesans
-
 import numpy as np  # type: ignore
 from numpy import pi, exp  # type: ignore
@@ -61 +60 @@
     # 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
@@ -67 +67 @@
     if _found_sesans == True:
         #Pre-compute the Hankel matrix (H)
-        H0,H, q_calc = sesans.Hankelconstructor(data)
+        qmax, qunits = data.sample.zacceptance
+        Hankelinst=sesans.SesansTransform()
+        sesans.SesansTransform.set_transform(Hankelinst,
+        SE = Converter(data._xunit)(data.x, "A"),
+        zaccept = Converter(qunits)(qmax, "1/A"),
+        Rmax = 1000000)
+        H=sesans.SesansTransform._H
+        H0=sesans.SesansTransform._H0
+        q=sesans.SesansTransform.q
         # Then return the actual transform, as if it were a smearing function
-        return PySmear(SESANS1D(data, H0, H, q_calc), model)
+        # applying evalDistribution to a model, with a q-space as param, returns the I(q) values that go with the q-values
+
+        return PySmear(SESANS1D(data, H0, H, q), model)
 
     _found_resolution = False
@@ -175 +185 @@
     width = data.dx if data.dx is not None else 0
     return PySmear(Pinhole1D(q, width), model)
-
-def sesans_smear(data, model=None):
-    #This should be calculated characteristic length scale
-    #Probably not a data prameter either
-    #Need function to calculate this based on model
-    #Here assume a number
-    Rmax = 1000000
-    q_calc = sesans.make_q(data.sample.zacceptance, Rmax)
-    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)