Changeset 8cebf9b in sasview

Timestamp:

Apr 2, 2008 9:34:34 AM (17 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:

2da23bc

Parents:

e2914b1

Message:

problem with log scale

Location:

guitools

Files:

• PlotPanel.py (modified) (9 diffs)
• plottables.py (modified) (1 diff)

guitools/PlotPanel.py

@@ -364 +364 @@
     def _onEVT_FUNC_PROPERTY(self):
         """
-             Receive the scale from myDialog and set the scale
+             Receive the x and y transformation from myDialog,Transforms x and y in View
+              and set the scale    
         """ 
         list =[]
@@ -372 +373 @@
                 if self.prevXtrans == "x^(2)":
                     item.transform_x(  self.fromX2, self.errFuncfromX2 )
-                #elif self.prevXtrans == "Log(x)"
-                    #item.transform_x(  self.fromLogXY,self.errFuncfromX2 )
-                print "Values of  x",item.x[0:5]
-                print "Values of view x",item.view.x[0:5]
+                
+                item.transform_x(  self.toX, self.errFunctoX )
                 self.set_xscale("linear")
                 self.graph.xaxis('\\rm{q} ', 'A^{-1}')
                 
             if ( self.xscales=="x^(2)" ):
-                #if self.prevXtrans == "Log(x)":
-                    #item.transform_x(  self.fromLogXY, self.errFunc )
                 if  self.prevXtrans != "x^(2)":
                     item.transform_x(  self.toX2, self.errFuncToX2 )
-                    print "Values of  x",item.x[0:5]
-                    print "Values of view x^(2)",item.view.x[0:5]
+                item.transform_x(  self.toX, self.errFunctoX )
                 self.set_xscale('linear')
                 self.graph.xaxis('\\rm{q^{2}} ', 'A^{-2}')
                 
             if (self.xscales=="Log(x)" ):
-                if self.prevXtrans == "x^(2)":
-                    item.transform_x(  self.fromX2, self.errFuncfromX2 )
-                #elif self.prevXtrans == "Log(x)":
-                    #item.transform_x(  self.toLogXY, self.errFunc )
-                #self.set_xscale("linear")
-                self.set_xscale('log')
-                self.graph.xaxis('\\rm{log(q)} ', 'A^{-1}')
+                #if self.prevXtrans == "x^(2)":
+                   # item.transform_x(  self.fromX2, self.errFuncfromX2 )
+                
+#                item.transform_x(  self.toX, self.errFuncToLogX )
+                self.set_xscale("log")
+                self.graph.xaxis('\\rm{q} ', 'A^{-1}')
                 
             if ( self.yscales=="y" ):
                 if self.prevYtrans == "y^(2)":
                     item.transform_y(  self.toX2, self.errFuncToX2 )
-                #elif self.prevXtrans == "Log(y)"
-                    #item.transform_y(  self.fromLogXY.errFunc )   
+                item.transform_x(  self.toX, self.errFunctoX )
                 self.set_yscale("linear")
                 self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
@@ -409 +403 @@
                 if self.prevYtrans == "y^(2)":
                      item.transform_y(  self.fromX2, self.errFuncfromX2 )
-                #elif self.prevYtrans != "Log(y)":
-                    #item.transform_y(  self.toLogXY, self.errFunc )
-                #self.set_yscale("linear")  
+                item.transform_x(  self.toX, self.errFuncToLogX)
                 self.set_yscale("log")  
                 self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
                 
             if ( self.yscales=="y^(2)" ):
-                 #if self.prevYtrans == "Log(y)":
-                       #item.transform_y(  self.fromLogXY, self.errFunc )
                 if self.prevYtrans != "y^(2)":
-                     item.transform_y(  self.toX2, self.errFuncToX2 )   
+                     item.transform_y(  self.toX2, self.errFuncToX2 )  
+                item.transform_x(  self.toX, self.errFunctoX )    
                 self.set_yscale("linear")
                 self.graph.yaxis("\\rm{Intensity^{2}} ","cm^{-2}")
@@ -429 +420 @@
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
-        
+    def errFunctoX(self,x,dx=None):
+        """
+            calculate error of x**2
+            @param x: float value
+            @param dx: float value
+        """
+        if dx >=x:
+            return 0.9*x
+        return dx
     def errFuncToX2(self,x,dx=None):
         """
@@ -437 +436 @@
         """
         if not dx == None:
-            return 2*x*dx
+            err = 2*x*dx
+            if err >= x:
+                err = 0.9*x
+            return err
         else:
-            raise ValueError, "Can't  calculate the error"
+            return 0.0
     def errFuncfromX2(self,x,dx=None):
         """
@@ -447 +449 @@
         """
         if (x > 0) and (dx != None):
-            err= dx/2*math.sqrt(x)
-            
+            err = dx/(2*math.sqrt(x))
+            if err >= x:
+                err = 0.9*x
+            return err
+        elif x==0.0:
+            err = 0.9*x
+            return err
         else:
-            raise ValueError, "Can't  calculate the error"
+            return 0.0
+        
     def errFuncToLogX(self,x,dx=None):
         """
@@ -457 +465 @@
             @param dx: float value
         """
-        if (x!=0) and ( dx != None):
+        if (x != 0) and ( dx != None):
             err= dx/x
             if err >= x:
@@ -463 +471 @@
             return err
         elif x==0:
-            raise ValueError, "On calculate error: Can't divide by zero"
+            err = 0.9*x
+            return err
         else:
-            raise ValueError, "Can't  calculate the error"
+            return 0
         
     def errFuncfromLogXY(self,x,dx=None):
@@ -478 +487 @@
                 err = 0.9*x
             return err
+        elif x == 0 :
+            err = 0.9*x
+            return err 
+        elif dx == None:
+            return 0
         else:
             raise ValueError, "Can't  calculate the error"

guitools/plottables.py

@@ -337 +337 @@
         self.view = View()
     def set_View(self,x,y):
+        """ Load View  """
         self.x= x
         self.y = y
-        
         self.reset_view()
         
     def reset_view(self):
+        """ Reload view with new value to plot"""
         self.view = self.View(self.x, self.y, self.dx, self.dy)