Changeset 3d3a0e5 in sasview for guitools

Timestamp:

Apr 9, 2008 4:19:25 PM (16 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:

7a03e65

Parents:

f52bea1

Message:

CHANGE PLOTPANEL PLOTTABLE

Location:

guitools

Files:

• PlotPanel.py (modified) (4 diffs)
• plottables.py (modified) (2 diffs)
• requirements.txt (modified) (1 diff)

guitools/PlotPanel.py

@@ -148 +148 @@
         else:
             raise ValueError,"cannot be computed"
-    def toLogYX2(self):
+    def toLogYX2(self,x,y):
         if y*(x**2) >0:
             return math.log(y*(x**2))
         else:
              raise ValueError,"cannot be computed"
+         
+         
+    def toYX2(self,x,y):
+        return (x**2)*y
+    
+    
+    def toXY(self,x,y):
+        return x*y
+    
+    
     def toLogXY(self,x,y):
         """
@@ -432 +442 @@
                 name, units = item.get_yaxis()
                 self.graph.yaxis("%s^2" % name,  "%s^{-2}" % units)
+            if ( self.yscales =="1/y"):
+                item.transform_y( self.toOneOverX ,self.errOneOverX )
+                self.set_yscale("linear")
+                name, units = item.get_yaxis()
+                self.graph.yaxis("%s" % name,  "%s" % units)
+            if ( self.yscales =="1/sqrt(y)" ):
+                item.transform_y( self.toOneOverSqrtX ,self.errOneOverSqrtX )
+                self.set_yscale("linear")
+                name, units = item.get_yaxis()
+                self.graph.yaxis("%s" %name,  "%s" % units)
+            if ( self.yscales =="Log(y*x)"):
+                item.transform_xy( self.toXY ,self.errToXY )
+                self.set_yscale("log")
+                yname, yunits = item.get_yaxis()
+                xname, xunits = item.get_xaxis()
+                self.graph.yaxis("%s"+"*"+"%s" % (yname,xname),  "%s^{-1}"+"*"+"s^{-1}" % (yunits,xunits))
+            if ( self.yscales =="Log(y*x^(2)"):
+                item.transform_xy( self.toYX2 ,self.errToYX2 )
+                self.set_yscale("log")
+                yname, yunits = item.get_yaxis()
+                xname, xunits = item.get_xaxis()
+                self.graph.yaxis("%s"+"*"+"%s^{2}" % (yname,xname),  "%s^{-1}"+"*"+"s^{-2}" % (yunits,xunits))
    
         self.prevXtrans = self.xscales 
@@ -500 +532 @@
         
         return math.fabs(err)
+    def errToXY(self, x, y, dx=None, dy=None):
+        if dx==None:
+            dx=0
+        if dy==None:
+            dy=0
+        err =math.sqrt((y*dx)**2 +(x*dy)**2)
+        if err >= math.fabs(x):
+            err =0.9*x
+        return err 
+    def errToYX2(self, x, y, dx=None, dy=None):
+        if dx==None:
+            dx=0
+        if dy==None:
+            dy=0
+        err =math.sqrt((2*x*y*dx)**2 +((x**2)*dy)**2)
+        if err >= math.fabs(x):
+            err =0.9*x
+        return err 
         
     def errToLogXY(self,x,y,dx=None, dy=None):
@@ -505 +555 @@
             calculate error of Log(xy)
         """
-        if dx==None:
-            err = x*(dy**2)/y
-        elif dy==None:
-            err = y*(dx**2)/x
-        elif (x!=0) and (y!=0):
-            err = y*(dx**2)/x + x*(dy**2)/y
-        if err >= 0:
-            if  math.sqrt(err)> x:
+        if (x!=0) and (y!=0):
+            if dx == None:
+                dx = 0
+            if dy == None:
+                dy = 0
+            err = (dx/x)**2 + (dy/y)**2
+            if  math.sqrt(math.fabs(err)) >= math.fabs(x):
                 err= 0.9*x
-            return math.sqrt(err)
         else:
             raise ValueError, "cannot compute this error"
+       
+        return math.sqrt(math.fabs(err))
+        
+    def errToLogYX2(self,x,y,dx=None, dy=None):
+        """
+            calculate error of Log(yx**2)
+        """
+        if (x > 0) and (y > 0):
+            if (dx == None):
+                dx = 0
+            if (dy == None):
+                dy = 0
+            err = 4*(dx**2)/(x**2) + (dy**2)/(y**2)
+            if math.fabs(err) >= math.fabs(x):
+                err =0.9*x
+        else:
+             raise ValueError, "cannot compute this error"
+         
+        return math.sqrt(math.fabs(err)) 
+            
+    def errOneOverX(self,x,dx):
+        """
+             calculate error on 1/x
+        """
+        if (x != 0) and (dx!=None):
+            if dx ==None:
+                dx= 0
+            err = -(dx)**2/x**2
+        else:
+            raise ValueError,"Cannot compute this error"
+        
+        if math.fabs(err)>= math.fabs(x):
+            err= 0.9*x
+        return math.fabs(err)
+    
+    def errOneOverSqrtX(self):
+        """
+            Calculate error on 1/sqrt(x)
+        """
+        if (x >0) and (dx!=None):
+            if dx==None:
+                dx =0
+            err= -1/2*math.pow(x, -3/2)* dx
+            if math.fabs(err)>= math.fabs(x):
+                err=0.9*x
+        else:
+            raise ValueError, "Cannot compute this error"
+        
+        return math.fabs(err)
+    
                       
     def onFitDisplay(self, plottable):

guitools/plottables.py

@@ -391 +391 @@
         self.view.transform_y(func, errfunc, self.y, self.dy)
         
+    def transform_xy(self,func,errfunc):
+        """
+            @param func: reference to y transformation function
+            
+        """
+        self.view.transform_xy(func, errfunc, self.x, self.y,self.dx,self.dy)
+        
     def returnValuesOfView(self):
         
@@ -460 +467 @@
                  else:
                      self.dy[i] = errfunc(y[i])
+        def transform_xy(self, func, errfunc, x, y, dx, dy):
+            """
+                Transforms the x, y, dx,and dy vectors and stores the output.
+                
+                @param func: function to apply to the data
+                @param x: array of x values
+                @param dx: array of error values
+                @param y: array of y values
+                @param dy: array of error values
+                @param errfunc: function to apply to errors
+            """
+            import copy
+            import numpy
+            # Sanity check
+            if dx and not len(x)==len(dx):
+                raise ValueError, "Plottable.View: Given x and dx are not of the same length"
+            if dy and not len(y)==len(dy):
+                raise ValueError, "Plottable.View: Given y and dy are not of the same length"
+            if not len(x)==len(y):
+                raise ValueError, "Plottable.View: Given x and y are not of the same length"
+            
+            self.x = numpy.zeros(len(x))
+            self.dx = numpy.zeros(len(x))
+            self.y = numpy.zeros(len(y))
+            self.dy = numpy.zeros(len(y))
+            
+           
+            for i in range(len(y)):
+                 self.y[i] = func(x[i],y[i])
+                 if (dx!=None) and (dy !=None):
+                     self.dy[i] = errfunc(x[i], y[i], dx[i], dy[i])
+                 elif (dx != None):
+                     self.dy[i] = errfunc(x[i], y[i], dx[i])
+                 elif (dy != None):
+                     self.dy[i] = errfunc(x[i], y[i],dy[i])
+                 else:
+                     self.dy[i] = errfunc(x[i], y[i])
                      
         def returnXview(self):

guitools/requirements.txt

@@ -51 +51 @@
   
   2- There are additional y scales we need: y, y^2, log(y), 1/y, 1/sqrt(y), log(y * x), log(y * x^2)
+  [QUESTION] when plottong y=log(y*x) is the user allowed to do transformation on x at the same time 
+  for example x---> log X with  y=log(x*y)
+  [PROBLEM]WITH  log(y * x), log(y * x^2)
         
   3-[DONE] You should change the label according to what the user chose, and not hard-code them.