Changeset 911dbe4 in sasview for src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

Timestamp:

Jul 11, 2016 4: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:

7a219e3e

Parents:

f2bbabf

git-author:

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

git-committer:

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

Message:

Add transform functionality

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (10 diffs)

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

@@ -38 +38 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
         self._manager = manager
-        self._data = data # The data to be analysed
+        # The data with no correction for background values
+        self._data = data # The data to be analysed (corrected fr background)
         self._extrapolated_data = None # The extrapolated data set
+        self._calculator = CorfuncCalculator()
         self._data_name_box = None # Text box to show name of file
         self._background_input = None
@@ -45 +47 @@
         self._qmax1_input = None
         self._qmax2_input = None
+        self._transform_btn = None
+        self._compute_btn = None
         self.qmin = 0
         self.qmax = (0, 0)
@@ -107 +111 @@
         :param data: The data that has been loaded
         """
+        self._transform_btn.Disable()
         if data is None:
             return
         self._data_name_box.SetValue(str(data.title))
         self._data = data
+        self._calculator.set_data(data)
         if self._manager is not None:
             from sas.sasgui.perspectives.corfunc.corfunc import IQ_DATA_LABEL
-            self._manager.show_data(data, IQ_DATA_LABEL, reset=True)
+            self._manager.show_data(self._data, IQ_DATA_LABEL, reset=True)
         if set_qrange:
             lower = data.x[-1]*0.05
@@ -120 +126 @@
             self.set_qmin(lower)
             self.set_qmax((upper1, upper2))
-            self.set_background(0.0)
+            self.set_background(self._calculator.compute_background(self.qmax))
 
     def get_data(self):
@@ -134 +140 @@
             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()
+        self._calculator.set_data(self._data)
+        self._calculator.lowerq = self.qmin
+        self._calculator.upperq = self.qmax
+        self._extrapolated_data = self._calculator.compute_extrapolation()
         # TODO: Find way to set xlim and ylim so full range of data can be
         # plotted
@@ -148 +155 @@
             IQ_EXTRAPOLATED_DATA_LABEL
         self._manager.show_data(to_plot, IQ_EXTRAPOLATED_DATA_LABEL)
+        self._transform_btn.Enable()
+
+    def compute_transform(self, event=None):
+        transformed_data = self._calculator.compute_transform(
+            self._extrapolated_data, self.background)
+        from sas.sasgui.perspectives.corfunc.corfunc import TRANSFORM_LABEL
+        import numpy as np
+        plot_x = transformed_data.x[np.where(transformed_data.x <= 200)]
+        plot_y = transformed_data.y[np.where(transformed_data.x <= 200)]
+        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL)
 
 
@@ -183 +200 @@
         self._background_input.SetValue(str(bg))
 
+    def _compute_background(self, event=None):
+        self.set_background(self._calculator.compute_background(self.qmax))
 
     def _on_enter_input(self, event=None):
@@ -200 +219 @@
         group_id = GROUP_ID_IQ_DATA
         if event is not None:
+            if self._manager is not None and\
+                event.GetEventObject() == self._background_input:
+                from sas.sasgui.perspectives.corfunc.corfunc\
+                    import IQ_DATA_LABEL
+                self._manager.show_data(self._data, IQ_DATA_LABEL, reset=True)
             wx.PostEvent(self._manager.parent, PlotQrangeEvent(
                 ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
@@ -309 +333 @@
             wx.RIGHT | wx.EXPAND, 5)
 
+        background_button = wx.Button(self, wx.NewId(), "Calculate",
+            size=(75, 25))
+        background_button.Bind(wx.EVT_BUTTON, self._compute_background)
+        q_sizer.Add(background_button, (1, 2), (1, 1), wx.RIGHT | wx.EXPAND, 5)
+
         qrange_label = wx.StaticText(self, -1, "Q Range:", size=(50,20))
         q_sizer.Add(qrange_label, (2,0), (1,1), wx.LEFT | wx.EXPAND, 5)
@@ -395 +424 @@
 
         extrapolate_btn = wx.Button(self, wx.NewId(), "Extrapolate")
-        transform_btn = wx.Button(self, wx.NewId(), "Transform")
-        compute_btn = wx.Button(self, wx.NewId(), "Compute Measuments")
+        self._transform_btn = wx.Button(self, wx.NewId(), "Transform")
+        self._compute_btn = wx.Button(self, wx.NewId(), "Compute Measuments")
+
+        self._transform_btn.Disable()
+        self._compute_btn.Disable()
 
         extrapolate_btn.Bind(wx.EVT_BUTTON, self.compute_extrapolation)
+        self._transform_btn.Bind(wx.EVT_BUTTON, self.compute_transform)
 
         controls_sizer.Add(extrapolate_btn, wx.CENTER | wx.EXPAND)
-        controls_sizer.Add(transform_btn, wx.CENTER | wx.EXPAND)
-        controls_sizer.Add(compute_btn, wx.CENTER | wx.EXPAND)
+        controls_sizer.Add(self._transform_btn, wx.CENTER | wx.EXPAND)
+        controls_sizer.Add(self._compute_btn, wx.CENTER | wx.EXPAND)
 
         controlbox_sizer.Add(controls_sizer, wx.TOP | wx.EXPAND, 0)