Changeset 0d64713 in sasview for src/sas/sasgui/guiframe

Timestamp:

Feb 28, 2017 1:17:19 PM (8 years ago)

Author:

GitHub <noreply@…>

Children:

13043af

Parents:

46f798f

git-author:

Jeff Krzywon <krzywon@…> (02/28/17 13:17:19)

git-committer:

GitHub <noreply@…> (02/28/17 13:17:19)

Message:

Revert "Sesans41"

Location:

src/sas/sasgui/guiframe

Files:

• dataFitting.py (modified) (8 diffs)
• data_manager.py (modified) (1 diff)

src/sas/sasgui/guiframe/dataFitting.py

@@ -17 +17 @@
     """
     """
-
-    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None, isSesans=False):
+    def __init__(self, x=None, y=None, dx=None, dy=None):
         """
         """
@@ -25 +24 @@
         if y is None:
             y = []
-        self.isSesans = isSesans
-        PlotData1D.__init__(self, x, y, dx, dy, lam, dlam)
-        LoadData1D.__init__(self, x, y, dx, dy, lam, dlam, isSesans)
-
+        PlotData1D.__init__(self, x, y, dx, dy)
+        LoadData1D.__init__(self, x, y, dx, dy)
         self.id = None
         self.list_group_id = []
@@ -35 +32 @@
         self.path = None
         self.xtransform = None
-        if self.isSesans:
-            self.xtransform = "x"
         self.ytransform = None
-        if self.isSesans:
-            self.ytransform = "y"
         self.title = ""
         self.scale = None
@@ -75 +68 @@
         # First, check the data compatibility
         dy, dy_other = self._validity_check(other)
-        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None)
+        result = Data1D(x=[], y=[], dx=None, dy=None)
         result.clone_without_data(length=len(self.x), clone=self)
         result.copy_from_datainfo(data1d=self)
@@ -122 +115 @@
         # First, check the data compatibility
         self._validity_check_union(other)
-        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None)
+        result = Data1D(x=[], y=[], dx=None, dy=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
@@ -152 +141 @@
         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)
@@ -276 +260 @@
         # First, check the data compatibility
         self._validity_check_union(other)
-        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=[])
+        result = Data1D(x=[], y=[], dx=None, dy=None)
         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
@@ -305 +285 @@
         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/guiframe/data_manager.py

@@ -61 +61 @@
         
         if issubclass(Data2D, data.__class__):
-            new_plot = Data2D(image=None, err_image=None) # For now, isSesans for 2D data is always false
-        else:
-            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=data.isSesans)
-
-
-        #elif data.meta_data['loader'] == 'SESANS':
-        #    new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=True)
-        #else:
-        #    new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None) #SESANS check???
-
+            new_plot = Data2D(image=None, err_image=None) 
+        else: 
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None)
+           
         new_plot.copy_from_datainfo(data)
         data.clone_without_data(clone=new_plot)