Changeset 3b8efec in sasview

Timestamp:

Jul 11, 2016 2:36:55 AM (8 years ago)

Author:

lewis

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:

77e9ac6

Parents:

b564ea2

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/07/16 05:29:10)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 02:36:55)

Message:

Add extrapolation functionality

Location:

src/sas

Files:

• sascalc/corfunc/__init__.py (added)
• sascalc/corfunc/corfunc_calculator.py (added)
• sasgui/perspectives/corfunc/corfunc.py (modified) (4 diffs)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (9 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -5 +5 @@
 import sys
 import logging
+import copy
 from sas.sasgui.guiframe.plugin_base import PluginBase
 from sas.sasgui.guiframe.gui_manager import MDIFrame
@@ -18 +19 @@
 
 
-GROUP_ID_IQ_DATA = r"$I_{obs}(q)$"
+GROUP_ID_IQ_DATA = r"$I(q)$"
 IQ_DATA_LABEL = r"$I_{obs}(q)$"
+IQ_EXTRAPOLATED_DATA_LABEL = r"$I_{extrap}(q)$"
 
 
@@ -117 +119 @@
                         info='error'))
 
-    def show_data(self, path=None, data=None, reset=False):
+    def show_data(self, data, label, path=None, reset=False):
         """
         Show data read from a file
@@ -125 +127 @@
         :param reset: If True, all other plottables will be cleared
         """
-        if data.dy is not None:
-            new_plot = Data1D(data.x, data.y, dy=data.dy)
-        else:
-            new_plot = Data1D(data.x, data.y)
+        new_plot = Data1D(data.x, data.y, dy=data.dy)
+
+        if label == IQ_DATA_LABEL or label == IQ_EXTRAPOLATED_DATA_LABEL:
+            new_plot.xaxis("\\rm{Q}", 'A^{-1}')
+            new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
+
         new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
-        new_plot.name = IQ_DATA_LABEL
-        new_plot.xaxis("\\rm{Q}", 'A^{-1}')
-        new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
+        new_plot.id = label
+        new_plot.name = label
         new_plot.interactive = True
         new_plot.group_id = GROUP_ID_IQ_DATA
-        new_plot.id = self.data_id
         new_plot.title = "I(q)"
         # Show data on a linear scale

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -6 +6 @@
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.guiframe.utils import check_float
+from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sasgui.perspectives.invariant.invariant_widgets import OutputTextCtrl
 from sas.sasgui.perspectives.invariant.invariant_widgets import InvTextCtrl
 from sas.sasgui.perspectives.fitting.basepage import ModelTextCtrl
 from sas.sasgui.perspectives.corfunc.corfunc_state import CorfuncState
+import sas.sasgui.perspectives.corfunc.corfunc
+from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator
 
 if sys.platform.count("win32") > 0:
@@ -36 +39 @@
         self._manager = manager
         self._data = data # The data to be analysed
+        self._extrapolated_data = None # The extrapolated data set
         self._data_name_box = None # Text box to show name of file
         self._background_input = None
@@ -52 +56 @@
         self._qmax1_input.Bind(wx.EVT_TEXT, self._on_enter_input)
         self._qmax2_input.Bind(wx.EVT_TEXT, self._on_enter_input)
+        self._background_input.Bind(wx.EVT_TEXT, self._on_enter_input)
 
     def set_state(self, state=None, data=None):
@@ -67 +72 @@
         if data is not None:
             self.state.data = data
-        self.set_data(self.state.data, set_qrange=False)
+        self.set_data(data, set_qrange=False)
         if self.state.qmin is not None:
             self.set_qmin(self.state.qmin)
@@ -107 +112 @@
         self._data = data
         if self._manager is not None:
-            self._manager.show_data(data=data, reset=True)
+            from sas.sasgui.perspectives.corfunc.corfunc import IQ_DATA_LABEL
+            self._manager.show_data(data, IQ_DATA_LABEL, reset=True)
         if set_qrange:
             lower = data.x[-1]*0.05
@@ -118 +124 @@
     def get_data(self):
         return self._data
+
+    def compute_extrapolation(self, event=None):
+        if self._data is None:
+            msg = "Data must be loaded in order to perform an extrapolation."
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+            return
+        if not self._validate_inputs:
+            msg = "Invalid Q range entered."
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+            return
+        calculator = CorfuncCalculator(self._data, self.qmin, self.qmax,
+            background=self.background)
+        self._extrapolated_data = calculator.compute_extrapolation()
+        # TODO: Find way to set xlim and ylim so full range of data can be
+        # plotted
+        maxq = self._data.x.max()
+        mask = self._extrapolated_data.x <= maxq
+        numpts = len(self._extrapolated_data.x[mask]) + 250
+        plot_x = self._extrapolated_data.x[0:numpts]
+        plot_y = self._extrapolated_data.y[0:numpts]
+        to_plot = Data1D(plot_x, plot_y)
+        from sas.sasgui.perspectives.corfunc.corfunc import\
+            IQ_EXTRAPOLATED_DATA_LABEL
+        self._manager.show_data(to_plot, IQ_EXTRAPOLATED_DATA_LABEL)
+
 
     def save_project(self, doc=None):
@@ -165 +196 @@
         self.qmax = (new_qmax1, new_qmax2)
         self.background = float(self._background_input.GetValue())
-        data_id = self._manager.data_id
-        from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA
+        from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA,\
+            IQ_DATA_LABEL
         group_id = GROUP_ID_IQ_DATA
         if event is not None:
             wx.PostEvent(self._manager.parent, PlotQrangeEvent(
                 ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
-                active=event.GetEventObject(), id=data_id, group_id=group_id,
+                active=event.GetEventObject(), id=IQ_DATA_LABEL, group_id=group_id,
                 leftdown=False))
 
@@ -201 +232 @@
                 qmin_valid = False
             elif background < 0 or background > self._data.y.max():
-                msg = "background must be positive and less than highest I value"
+                msg = "background must be positive and less than highest I"
                 background_valid = False
         if not qmin_valid:
@@ -365 +396 @@
         compute_btn = wx.Button(self, wx.NewId(), "Compute Measuments")
 
+        extrapolate_btn.Bind(wx.EVT_BUTTON, self.compute_extrapolation)
+
         controls_sizer.Add(extrapolate_btn, wx.CENTER | wx.EXPAND)
         controls_sizer.Add(transform_btn, wx.CENTER | wx.EXPAND)