Changeset 3b8efec in sasview for src/sas/sasgui/perspectives/corfunc/corfunc.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:

77e9ac6

Parents:

b564ea2

git-author:

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

git-committer:

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

Message:

Add extrapolation functionality

File:

• src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) (4 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