Changeset 05da1f89 in sasview for guitools/transform.py

Timestamp:

May 29, 2008 12:18:32 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b6972a0f

Parents:

e39640f

Message:

Some mods to improve the look of the fit dialog and fix minor bugs.

File:

• guitools/transform.py (modified) (14 diffs)

guitools/transform.py

@@ -27 +27 @@
      else:
          return math.sqrt(x)
+     
 def toLogX(x,y=None):
     """
@@ -43 +44 @@
     else:
         raise ValueError,"cannot divide by zero"
+    
 def toOneOverSqrtX(y , x=None):
-    if y!=None:
-        if y > 0:
-            return 1/math.sqrt(y)
-        else:
-            raise ValueError,"cannot be computed"
+    if y > 0:
+        return 1/math.sqrt(y)
+    else:
+        raise ValueError,"transform.toOneOverSqrtX: cannot be computed"
     
     
@@ -55 +56 @@
         return math.log(y*(x**2))
     else:
-         raise ValueError,"cannot be computed"
+         raise ValueError,"transform.toLogYX2: cannot be computed"
      
 
@@ -61 +62 @@
     if math.pow(x,4)*y > 0:
         return math.log(math.pow(x,4)*y)
+    else:
+         raise ValueError,"transform.toLogYX4: input error"
 
 def toLogXY(y,x):
@@ -94 +97 @@
     if  dx != None:
         err = 2*x*dx
-        if math.fabs(err) >= math.fabs(x):
-            err = 0.9*x
         return math.fabs(err)
     else:
         return 0.0
+    
 def errFromX2(x,y=None,dx=None,dy=None):
     """
@@ -110 +112 @@
         else:
             err = 0
-        if math.fabs(err) >= math.fabs(x):
-            err = 0.9*x    
-    else:
-        err = 0.9*x
-       
         return math.fabs(err)
+    else:
+        raise ValueError, "transform.errFromX2: can't compute error of negative x"
+    
 def errToLog10X(x,y=None,dx=None,dy=None):
     """
@@ -129 +129 @@
         raise ValueError, "errToLogX: divide by zero"
     
-    if math.fabs(dx) >= math.fabs(x):
-        dx = 0.9*x
-    
     return dx
     
@@ -146 +143 @@
     else:
         raise ValueError, "errToLogX: divide by zero"
-    
-    if math.fabs(dx) >= math.fabs(x):
-        dx = 0.9*x
     
     return dx
@@ -160 +154 @@
         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 
     
@@ -174 +166 @@
             dy = 0
         err = (dx/x)**2 + (dy/y)**2
-        #if  math.sqrt(math.fabs(err)) >= math.fabs(x):
-        #    err= 0.9*x
     else:
         raise ValueError, "cannot compute this error"
@@ -190 +180 @@
         if (dy == None):
             dy = 0
-        err = (2*dx/x)**2 + (dy/y)**2
-        #if math.fabs(err) >= math.fabs(x):
-        #   err =0.9*x
+        err = (2.0*dx/x)**2 + (dy/y)**2
     else:
          raise ValueError, "cannot compute this error"
@@ -205 +193 @@
         if dx ==None:
             dx= 0
-        err = -(dx)**2/x**2
+        err = dx/x**2
     else:
         raise ValueError,"Cannot compute this error"
     
-    if math.fabs(err)>= math.fabs(x):
-        err= 0.9*x
     return math.fabs(err)
 
@@ -220 +206 @@
         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
+        err= -1/2*math.pow(x, -3.0/2.0)* dx
     else:
         raise ValueError, "Cannot compute this error"
     
     return math.fabs(err)
+
 def errToLogYX4(x,y=None,dx=None,dy=None):
     """
@@ -236 +221 @@
     if dy==None:
         dy=0
-    err =math.sqrt((4*dx/x)**2 +(dy/y)**2)
-    #if err >= math.fabs(x):
-    #err =0.9*x
+    err =math.sqrt((4.0*dx/x)**2 +(dy/y)**2)
     return err