Changeset 632e2e8 in sasview for src/sas

Timestamp:

Nov 20, 2016 7:54:54 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:

1cad8a4

Parents:

a5b8253 (diff), 4466a6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Jurrian1D_optSESclass' into Jurrian1D_opt

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (3 diffs)
• sasgui/perspectives/fitting/basepage.py (modified) (3 diffs)
• sasgui/perspectives/fitting/fitpage.py (modified) (2 diffs)
• sasgui/plottools/PlotPanel.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -14 +14 @@
 import sys
 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.resolution import Slit1D, Pinhole1D
+from sasmodels.sesans import SESANS1D
 from sasmodels.resolution2d import Pinhole2D
 from src.sas.sascalc.data_util.nxsunit import Converter
@@ -60 +59 @@
     # 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
@@ -66 +66 @@
     if _found_sesans == True:
         #Pre-compute the Hankel matrix (H)
-        H0,H, q_calc = sesans.Hankelconstructor(data)
+        qmax, qunits = data.sample.zacceptance
+        hankel=sesans.SesansTransform()
+        sesans.SesansTransform.set_transform(hankel,
+        SE = Converter(data._xunit)(data.x, "A"),
+        zaccept = Converter(qunits)(qmax, "1/A"),
+        Rmax = 1000000)
         # Then return the actual transform, as if it were a smearing function
-        return PySmear(SESANS1D(data, H0, H, q_calc), model)
+        return PySmear(SESANS1D(data, hankel._H0, hankel._H, hankel.q), model)
 
     _found_resolution = False

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

@@ -431 +431 @@
         self.sizer2 = wx.BoxSizer(wx.VERTICAL)
         self.sizer3 = wx.BoxSizer(wx.VERTICAL)
-        self.sizerTrafo = wx.BoxSizer(wx.VERTICAL)
         self.sizer4 = wx.BoxSizer(wx.VERTICAL)
         self.sizer5 = wx.BoxSizer(wx.VERTICAL)
@@ -440 +439 @@
         self.sizer2.SetMinSize((PANEL_WIDTH, -1))
         self.sizer3.SetMinSize((PANEL_WIDTH, -1))
-        self.sizerTrafo.SetMinSize((PANEL_WIDTH, -1))
         self.sizer4.SetMinSize((PANEL_WIDTH, -1))
         self.sizer5.SetMinSize((PANEL_WIDTH, -1))
@@ -449 +447 @@
         self.vbox.Add(self.sizer2)
         self.vbox.Add(self.sizer3)
-        self.vbox.Add(self.sizerTrafo)
         self.vbox.Add(self.sizer4)
         self.vbox.Add(self.sizer5)

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

@@ -55 +55 @@
         self.weightbt_string = None
         self.m_name = None
-        # transform implementation
-        self._fill_Trafo_sizer()
-       # self.Trafobt_string()
         # get smear info from data
         self._get_smear_info()
@@ -95 +92 @@
         self.parent.on_set_focus(event)
         self.on_tap_focus()
-
-    def onTrafo(self, event):
-        """
-        On Trafo radio button event, sets the Trafobt_string
-        """
-        self.Trafobt_string = event.GetEventObject().GetLabelText()
-        self._set_Trafo()
-
-    def _fill_Trafo_sizer(self):
-
-        title = "Transform"
-        box_description_trafo = wx.StaticBox(self, wx.ID_ANY, str(title))
-        box_description_trafo.SetForegroundColour(wx.BLUE)
-        #boxsizer_trafo = wx.StaticBoxSizer(box_description_trafo, wx.VERTICAL)
-        boxsizer_trafo = wx.StaticBoxSizer(box_description_trafo, wx.HORIZONTAL)
-        #sizer_trafo = wx.StaticBoxSizer(box_description_trafo, wx.HORIZONTAL)
-        #weighting_set_box = wx.StaticBox(self, wx.ID_ANY,
-         #                              'Select the type of SESANS analysis')
-
-        #sizer_weighting = wx.BoxSizer(wx.HORIZONTAL)
-          #      weighting_box.SetMinSize((_DATA_BOX_WIDTH, 60))
-
-        #For every radio button (each statement x3):
-        self.no_transform = wx.RadioButton(self, wx.ID_ANY,
-                                                  'None', style=wx.RB_GROUP)
-
-        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-         #                 id=self.no_transform.GetId())
-        self.hankel = wx.RadioButton(self, wx.ID_ANY,
-                                                  'Hankel')
-        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-        #                  id=self.hankel.GetId())
-        self.cosine = wx.RadioButton(self, wx.ID_ANY,
-                                                  'Cosine')
-        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-         #                 id=self.cosine.GetId())
-
-        #Not sure about this (only once though)
-        self.no_transform.SetValue(True)
-
-        #For every radio button (each statement x3):
-        boxsizer_trafo.Add(self.no_transform, 0, wx.LEFT, 10)
-        boxsizer_trafo.Add((14, 10))
-        boxsizer_trafo.Add(self.hankel)
-        boxsizer_trafo.Add((14, 10))
-        boxsizer_trafo.Add(self.cosine)
-        boxsizer_trafo.Add((14, 10))
-            #Default for weighting is False, but these need to be on by default!
-        self.no_transform.Enable(True)
-
-        #Not sure about this (only once though)
-        #weighting_box.Add(sizer_trafo)
-
-        self.sizerTrafo.Clear(True)
-        self.sizerTrafo.Add(boxsizer_trafo, 0, wx.EXPAND | wx.ALL, 10)
-        #self.sizerTrafo.Add(sizer_trafo, 0, wx.EXPAND | wx.ALL, 10)
-        self.sizerTrafo.Layout()
 
     def _fill_data_sizer(self):

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