Changeset f193585 in sasview for guitools/transform.py

Timestamp:

Apr 28, 2008 5:48:59 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:

6ed101a

Parents:

9e8dc22

Message:

some changes

File:

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

guitools/transform.py

@@ -43 +43 @@
     else:
         raise ValueError,"cannot divide by zero"
-def toOneOverSqrtX(x=None,y=None):
+def toOneOverSqrtX(y , x=None):
     if y!=None:
         if y > 0:
@@ -49 +49 @@
         else:
             raise ValueError,"cannot be computed"
-    if x!= None:
-        if x > 0:
-            return 1/math.sqrt(x)
-        else:
-            raise ValueError,"cannot be computed"
-    
-def toLogYX2(x,y):
+    
+    
+def toLogYX2(y,x):
     if y*(x**2) >0:
         return math.log(y*(x**2))
@@ -62 +58 @@
      
 
-def toLogYX4(x, y):
+def toLogYX4(y, x):
     if math.pow(x,4)*y > 0:
         return math.log(math.pow(x,4)*y)
 
-def toLogXY(x,y):
+def toLogXY(y,x):
     """
         This function is used to load value on Plottable.View
@@ -85 +81 @@
         @param dx: float value
     """
+    if dx==None:
+        dx=0
     return dx