Changeset 901142f in sasview

Timestamp:

Apr 23, 2010 8:06:21 AM (14 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:

18d0bba

Parents:

8569cb9

Message:

make sur the datafitting data are working like data_info data

Location:

guiframe

Files:

• dataFitting.py (modified) (9 diffs)
• test/cansas1d.xml (added)
• test/utest_manipulations.py (added)

guiframe/dataFitting.py

@@ -4 +4 @@
 import copy
 import numpy
-
+import math
+from data_util.uncertainty import Uncertainty
 from danse.common.plottools.plottables import Data1D as PlotData1D
 from danse.common.plottools.plottables import Data2D as PlotData2D
@@ -17 +18 @@
         PlotData1D.__init__(self, x, y, dx, dy)
         LoadData1D.__init__(self, x, y, dx, dy)
-        self.id= None
-        self.group_id =None
+        self.id = None
+        self.group_id = None
         self.is_data = True
     
@@ -36 +37 @@
             self.dxw = copy.deepcopy(data1d.dxw)
     
-        self.xaxis(data1d._xaxis,data1d._xunit)
-        self.yaxis(data1d._yaxis,data1d._yunit)
+        self.xaxis(data1d._xaxis, data1d._xunit)
+        self.yaxis(data1d._yaxis, data1d._yunit)
         
     def __str__(self):
@@ -46 +47 @@
       
         return _str 
+    
+    def _perform_operation(self, other, operation):
+        """
+        """
+        # First, check the data compatibility
+        dy, dy_other = self._validity_check(other)
+        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result.clone_without_data(clone=self)
+        result.copy_from_datainfo(data1d=self)
+        for i in range(len(self.x)):
+            result.x[i] = self.x[i]
+            if self.dx is not None and len(self.x) == len(self.dx):
+                result.dx[i] = self.dx[i]
+            
+            a = Uncertainty(self.y[i], dy[i]**2)
+            if isinstance(other, Data1D):
+                b = Uncertainty(other.y[i], dy_other[i]**2)
+            else:
+                b = other
+            
+            output = operation(a, b)
+            result.y[i] = output.x
+            if result.dy is None: result.dy = numpy.zeros(len(self.x))
+            result.dy[i] = math.sqrt(math.fabs(output.variance))
+        return result
+    
 class Theory1D(PlotTheory1D,LoadData1D):
     
-    def __init__(self,x=[],y=[],dy=None):
+    def __init__(self, x=[], y=[], dy=None):
         PlotTheory1D.__init__(self, x, y, dy)
         LoadData1D.__init__(self, x, y, dy)
-        self.id= None
+        self.id = None
         self.group_id = None
         self.is_data = True
@@ -68 +95 @@
         if hasattr(data1d, "dxw"):
             self.dxw = copy.deepcopy(data1d.dxw)    
-        self.xaxis(data1d._xaxis,data1d._xunit)
-        self.yaxis(data1d._yaxis,data1d._yunit)
+        self.xaxis(data1d._xaxis, data1d._xunit)
+        self.yaxis(data1d._yaxis, data1d._yunit)
         
     def __str__(self):
@@ -78 +105 @@
       
         return _str 
+    
+    def _perform_operation(self, other, operation):
+        """
+        """
+        # First, check the data compatibility
+        dy, dy_other = self._validity_check(other)
+        result = Theory1D(x=[], y=[], dy=None)
+        result.clone_without_data(clone=self)
+        result.copy_from_datainfo(data1d=self)
+        for i in range(len(self.x)):
+            result.x[i] = self.x[i]
+           
+            a = Uncertainty(self.y[i], dy[i]**2)
+            if isinstance(other, Data1D):
+                b = Uncertainty(other.y[i], dy_other[i]**2)
+            else:
+                b = other
+            
+            output = operation(a, b)
+            result.y[i] = output.x
+            if result.dy is None: result.dy = numpy.zeros(len(self.x))
+            result.dy[i] = math.sqrt(math.fabs(output.variance))
+        return result
+    
       
 class Data2D(PlotData2D,LoadData2D):
-    def __init__(self,image=None,err_image=None,xmin=None,xmax=None,ymin=None,ymax=None,zmin=None,zmax=None):
-        
-        PlotData2D.__init__(self, image=image, err_image=err_image,xmin=xmin, xmax=xmax,
-                            ymin=ymin, ymax=ymax)
-        
-        LoadData2D.__init__(self,data=image, err_data=err_image, qx_data=None,qy_data=None,q_data=None,mask=None)
+    def __init__(self, image=None, err_image=None,
+                 xmin=None, xmax=None, ymin=None, ymax=None,
+                 zmin=None, zmax=None, qx_data=None, qy_data=None,
+                 q_data=None, mask=None, dqx_data=None, dqy_data=None):
+        
+        PlotData2D.__init__(self, image=image, err_image=err_image,
+                            xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax,
+                            zmin=zmin, zmax=zmax, qx_data=qx_data, 
+                            qy_data=qy_data)
+        
+        LoadData2D.__init__(self, data=image, err_data=err_image,
+                            qx_data=qx_data, qy_data=qy_data,
+                            dqx_data=dqx_data, dqy_data=dqy_data,
+                            q_data=q_data, mask=mask)
         
     def copy_from_datainfo(self, data2d):
@@ -92 +151 @@
         """
         self.data     =  copy.deepcopy(data2d.data)
-        self.qx_data     =  copy.deepcopy(data2d.qx_data)
-        self.qy_data     =  copy.deepcopy(data2d.qy_data)
-        self.q_data     =  copy.deepcopy(data2d.q_data)
+        self.qx_data  =  copy.deepcopy(data2d.qx_data)
+        self.qy_data  =  copy.deepcopy(data2d.qy_data)
+        self.q_data    =  copy.deepcopy(data2d.q_data)
         self.mask     =  copy.deepcopy(data2d.mask)
         self.err_data =  copy.deepcopy(data2d.err_data)
@@ -104 +163 @@
         self.ymin       = data2d.ymin
         self.ymax       = data2d.ymax
-        
-        self.xaxis(data2d._xaxis,data2d._xunit)
-        self.yaxis(data2d._yaxis,data2d._yunit)
+        self.zmin       = data2d.zmin
+        self.zmax       = data2d.zmax
+        
+        self.xaxis(data2d._xaxis, data2d._xunit)
+        self.yaxis(data2d._yaxis, data2d._yunit)
         
     def __str__(self):
@@ -115 +176 @@
       
         return _str 
-        
+    
+    def _perform_operation(self, other, operation):
+        """
+            Perform 2D operations between data sets
+            
+            @param other: other data set
+            @param operation: function defining the operation
+        """
+        # First, check the data compatibility
+        dy, dy_other = self._validity_check(other)
+    
+        result = Data2D(image=None, qx_data=None, qy_data=None,
+                         err_image=None, xmin=None, xmax=None,
+                         ymin=None, ymax=None, zmin=None, zmax=None)
+        
+        result.clone_without_data(clone=self)
+        result.copy_from_datainfo(data2d=self)
+        
+        for i in range(numpy.size(self.data,0)):
+            for j in range(numpy.size(self.data,1)):
+                result.data[i][j] = self.data[i][j]
+                if self.err_data is not None and \
+                        numpy.size(self.data)==numpy.size(self.err_data):
+                    result.err_data[i][j] = self.err_data[i][j]
+                
+                a = Uncertainty(self.data[i][j], dy[i][j]**2)
+                if isinstance(other, Data2D):
+                    b = Uncertainty(other.data[i][j], dy_other[i][j]**2)
+                else:
+                    b = other
+                
+                output = operation(a, b)
+                result.data[i][j] = output.x
+                result.err_data[i][j] = math.sqrt(math.fabs(output.variance))
+        return result
+