Changeset 8e44d51 in sasview for guitools/transform.py

Timestamp:

Apr 16, 2008 10:22:24 AM (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:

35891ce

Parents:

3aa7074

Message:

one more bug fixed

File:

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

guitools/transform.py

@@ -83 +83 @@
     else:
         return math.log(x*y)
-def errToLogYX4(x,y=None,dx=None,dy=None):
-    """
-        error for ln(y*x^(4))
-        @param x: float value
-    """
-    if dx==None:
-        dx=0
-    if dy==None:
-        dy=0
-    err =math.sqrt((4*dx/x)**2 +(dy/y)**2)
-    if err >= math.fabs(x):
-        err =0.9*x
-    return err 
+
 def fromLogXY(self,x):
     """
@@ -204 +192 @@
         if (dy == None):
             dy = 0
-        err = 4*(dx**2)/(x**2) + (dy**2)/(y**2)
+        err = (2*dx/x)**2 + (dy/y)**2
         if math.fabs(err) >= math.fabs(x):
             err =0.9*x
@@ -241 +229 @@
     
     return math.fabs(err)
+def errToLogYX4(x,y=None,dx=None,dy=None):
+    """
+        error for ln(y*x^(4))
+        @param x: float value
+    """
+    if dx==None:
+        dx=0
+    if dy==None:
+        dy=0
+    err =math.sqrt((4*dx/x)**2 +(dy/y)**2)
+    if err >= math.fabs(x):
+        err =0.9*x
+    return err