Changeset 7988501 in sasview for src/sas/sasgui

Timestamp:

Oct 8, 2016 2:34:03 PM (8 years ago)

Author:

jhbakker

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:

51a4d78

Parents:

6df015de

Message:

Data1D class changed to include SESANS Data format

Location:

src/sas/sasgui

Files:

• guiframe/dataFitting.py (modified) (7 diffs)
• perspectives/fitting/basepage.py (modified) (2 diffs)
• perspectives/fitting/fitpage.py (modified) (2 diffs)
• plottools/plottables.py (modified) (2 diffs)

src/sas/sasgui/guiframe/dataFitting.py

@@ -17 +17 @@
     """
     """
-    def __init__(self, x=None, y=None, dx=None, dy=None):
+    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None):
         """
         """
@@ -24 +24 @@
         if y is None:
             y = []
-        PlotData1D.__init__(self, x, y, dx, dy)
-        LoadData1D.__init__(self, x, y, dx, dy)
+        PlotData1D.__init__(self, x, y, lam, dx, dy, dlam)
+        LoadData1D.__init__(self, x, y, lam, dx, dy, dlam)
         self.id = None
         self.list_group_id = []
@@ -68 +68 @@
         # First, check the data compatibility
         dy, dy_other = self._validity_check(other)
-        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None)
         result.clone_without_data(length=len(self.x), clone=self)
         result.copy_from_datainfo(data1d=self)
@@ -115 +115 @@
         # First, check the data compatibility
         self._validity_check_union(other)
-        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None)
         tot_length = len(self.x) + len(other.x)
         result = self.clone_without_data(length=tot_length, clone=result)
+        if self.dlam == None or other.dlam is None:
+            result.dlam = None
+        else:
+            result.dlam = numpy.zeros(tot_length)
         if self.dy == None or other.dy is None:
             result.dy = None
@@ -141 +145 @@
         result.y = numpy.append(self.y, other.y)
         result.y = result.y[ind]
+        result.lam = numpy.append(self.lam, other.lam)
+        result.lam = result.lam[ind]
+        if result.dlam != None:
+            result.dlam = numpy.append(self.dlam, other.dlam)
+            result.dlam = result.dlam[ind]
         if result.dy != None:
             result.dy = numpy.append(self.dy, other.dy)
@@ -260 +269 @@
         # First, check the data compatibility
         self._validity_check_union(other)
-        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=[])
         tot_length = len(self.x)+len(other.x)
         result.clone_without_data(length=tot_length, clone=self)
+        if self.dlam == None or other.dlam is None:
+            result.dlam = None
+        else:
+            result.dlam = numpy.zeros(tot_length)
         if self.dy == None or other.dy is None:
             result.dy = None
@@ -285 +298 @@
         result.y = numpy.append(self.y, other.y)
         result.y = result.y[ind]
+        result.lam = numpy.append(self.lam, other.lam)
+        result.lam = result.lam[ind]
         if result.dy != None:
             result.dy = numpy.append(self.dy, other.dy)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -282 +282 @@
                            num=self.npts_x, endpoint=True)
         self.data = Data1D(x=x)
-        self.data.xaxis('\\rm{Q}', "A^{-1}")
-        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        #self.data.xaxis('\\rm{Q}', "A^{-1}")
+        self.data.xaxis('\\rm{X}', "")
+        #self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        self.data.yaxis('\\rm{Y}', "")
         self.data.is_data = False
         self.data.id = str(self.uid) + " data"
@@ -308 +310 @@
                            num=self.npts_x, endpoint=True, base=10.0)
         self.data = Data1D(x=x)
-        self.data.xaxis('\\rm{Q}', "A^{-1}")
-        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        #self.data.xaxis('\\rm{Q}', "A^{-1}")
+        #self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        self.data.xaxis('\\rm{X}', "")
+        self.data.yaxis('\\rm{Y}', "")
         self.data.is_data = False
         self.data.id = str(self.uid) + " data"

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -98 +98 @@
     def onTrafo(self, event):
         """
-        On Weighting radio button event, sets the weightbt_string
+        On Trafo radio button event, sets the Trafobt_string
         """
         self.Trafobt_string = event.GetEventObject().GetLabelText()
@@ -120 +120 @@
         self.no_transform = wx.RadioButton(self, wx.ID_ANY,
                                                   'None', style=wx.RB_GROUP)
-        self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-                          id=self.no_transform.GetId())
+
+        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
+         #                 id=self.no_transform.GetId())
         self.hankel = wx.RadioButton(self, wx.ID_ANY,
                                                   'Hankel')
-        self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-                          id=self.hankel.GetId())
+        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
+        #                  id=self.hankel.GetId())
         self.cosine = wx.RadioButton(self, wx.ID_ANY,
                                                   'Cosine')
-        self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-                          id=self.cosine.GetId())
+        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
+         #                 id=self.cosine.GetId())
 
         #Not sure about this (only once though)

src/sas/sasgui/plottools/plottables.py

@@ -1022 +1022 @@
     """
 
-    def __init__(self, x, y, dx=None, dy=None):
+    def __init__(self, x, y, lam=None, dx=None, dy=None, dlam=None):
         """
         Draw points specified by x[i],y[i] in the current color/symbol.
@@ -1036 +1036 @@
         self.x = x
         self.y = y
+        self.lam = lam
         self.dx = dx
         self.dy = dy
+        self.dlam = dlam
         self.source = None
         self.detector = None