Changeset dc72638 in sasview

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:

688d029

Parents:

6970e51

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/08/16 05:23:41)

git-committer:

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

Message:

Plot data with background subtracted

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (1 diff)
• corfunc_panel.py (modified) (1 diff)

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

@@ -122 +122 @@
                         info='error'))
 
-    def show_data(self, data, label, path=None, reset=False):
+    def show_data(self, data, label, reset=False):
         """
         Show data read from a file
 
-        :param path: The path to the file
         :param data: The data to plot (Data1D)
         :param label: What to label the plot. Also used as the plot ID
         :param reset: If True, all other plottables will be cleared
         """
-        new_plot = Data1D(data.x, data.y, dy=data.dy)
-
+        new_plot = Data1D(data.x, copy.deepcopy(data.y), dy=data.dy)
         group_id = ""
         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.y -= self.corfunc_panel.background
             group_id = GROUP_ID_IQ_DATA
         elif label == TRANSFORM_LABEL:

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

@@ -209 +209 @@
         self.background = bg
         self._background_input.SetValue(str(bg))
+        self._calculator.background = bg
 
     def _compute_background(self, event=None):