Changeset a5b8253 in sasview

Timestamp:

Nov 20, 2016 3:47:39 AM (7 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:

632e2e8

Parents:

a01af35

Message:

some small fixes

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (2 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
 
 import numpy as np  # type: ignore
 from numpy import pi, exp  # type: ignore
-#from scipy.special import j as besselj
+#from scipy.special import jv as besselj
 
 from sasmodels.resolution import Slit1D, Pinhole1D, SESANS1D
@@ -175 +174 @@
     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)

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):
         """