Changeset 2e07e8f in sasview

Timestamp:

May 7, 2008 5:58:36 PM (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:

abad620

Parents:

383189f9

Message:

litle change on fit

Location:

guitools

Files:

• fitDialog.py (modified) (2 diffs)
• transform.py (modified) (1 diff)

guitools/fitDialog.py

@@ -289 +289 @@
                     tempy.append(y_model)
                 #Set the fit parameter display when  FitDialog is opened again
-                self.Avalue=cstA
-                self.Bvalue=cstB
+                self.Avalue=cstB
+                self.Bvalue=cstA
                 self.ErrAvalue=errA
                 self.ErrBvalue=errB
@@ -297 +297 @@
                 
                 # Display the fitting value on the Fit Dialog
-                self._onsetValues(cstA, cstB, errA,errB,chisqr)
+                self._onsetValues(cstB, cstA, errA,errB,chisqr)
                
                

guitools/transform.py

@@ -116 +116 @@
        
         return math.fabs(err)
+def errToLog10X(x,y=None,dx=None,dy=None):
+    """
+        calculate error of Log(x)
+        @param x: float value
+        @param dx: float value
+    """
+    if dx==None:
+        dx = 0
+    if x!=0:
+        dx = dx/(x*math.log(10))
+    else:
+        raise ValueError, "errToLogX: divide by zero"
+    
+    if math.fabs(dx) >= math.fabs(x):
+        dx = 0.9*x
+    
+    return dx
     
 def errToLogX(x,y=None,dx=None,dy=None):