Changeset deeba75 in sasview for sansview/perspectives

Timestamp:

Jan 21, 2010 4:42:55 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

91db958

Parents:

76c1727

Message:

add more plot for invariant panel

File:

• sansview/perspectives/fitting/invariant_panel.py (modified) (5 diffs)

sansview/perspectives/fitting/invariant_panel.py

@@ -8 +8 @@
 
 from sans.invariant import invariant
-from sans.guiframe.dataFitting import Theory1D
+from sans.guiframe.dataFitting import Theory1D, Data1D
 from sans.guiframe.utils import format_number, check_float
 from sans.guicomm.events import NewPlotEvent, StatusEvent
@@ -16 +16 @@
 # The maximum q-value to be used when extrapolating
 Q_MAXIMUM  = 10
+# the maximum value to plot the theory data
+Q_MAXIMUM_PLOT = 2
 # the number of points to consider during fit
 NPTS = 10
@@ -144 +146 @@
                     check_float(self.invariant_low_ctl)
                     #plot data
-                    low_data = inv.get_extra_data_low()
-                    self._plot_data(data=low_data, name=self.data.name+" Extra_low_Q")
+                    low_out_data, low_in_data = inv.get_extra_data_low()
+                    self._plot_theory(data=low_out_data, name=self.data.name+" Extra_low_Q")
+                    self._plot_data(data=low_in_data, name=self.data.name+"Fitted data for low_Q")
                 except:
                     raise
@@ -156 +159 @@
                     check_float(self.invariant_high_ctl)
                     #plot data
-                    high_data = inv.get_extra_data_high()
-                    self._plot_data(data=high_data, name=self.data.name+" Extra_high_Q")
+                    high_out_data, high_in_data = inv.get_extra_data_high(q_end=Q_MAXIMUM_PLOT)
+                    self._plot_theory(data=high_out_data, name=self.data.name+" Extra_high_Q")
+                    self._plot_data(data=high_in_data, name=self.data.name+"Fitted data for high_Q")
                 except:
                     raise
@@ -217 +221 @@
         """
         # Create a plottable data
+        new_plot = Data1D(x=[], y=[], dx=None, dy=None)
+        if data is not None:
+            new_plot.copy_from_datainfo(data) 
+            data.clone_without_data(clone=new_plot) 
+            
+        new_plot.name = name
+        title = self.data.name
+        new_plot.xaxis(self.data._xaxis, self.data._xunit)
+        new_plot.yaxis(self.data._yaxis, self.data._yunit)
+        new_plot.group_id = self.data.group_id
+        new_plot.id = self.data.id + name
+        ##post data to plot
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
+        
+    def _plot_theory(self, data=None, name="Unknown"):
+        """
+            Receive a data and post a NewPlotEvent to parent
+            @param data: data created frome xtrapolation to plot
+            @param name: Data's name to use for the legend
+        """
+        # Create a plottable data
         new_plot = Theory1D(x=[], y=[], dy=None)
         if data is not None: