Changeset 8e44d51 in sasview

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

Location:

guitools

Files:

• PlotPanel.py (modified) (1 diff)
• fitDialog.py (modified) (10 diffs)
• plottables.py (modified) (5 diffs)
• transform.py (modified) (3 diffs)

guitools/PlotPanel.py

@@ -389 +389 @@
                 self.graph.yaxis("%s%s" % (yname,xname),  "%s^{-1}%s^{-1}" % (yunits,xunits))
                 
-            if ( self.yscales =="ln(y*x^(2)"):
-                item.transform_y( transform.toYX2 ,transform.ToYX2 )
+            if ( self.yscales =="ln(y*x^(2))"):
+                item.transform_y( transform.toYX2 ,transform.errToLogYX2 )
                 self.set_yscale("linear")
                 yname, yunits = item.get_yaxis()

guitools/fitDialog.py

@@ -43 +43 @@
         self.btClose =wx.Button(panel, wx.ID_CANCEL,'Close',size=(90, 30) )
         self.static_line_1 = wx.StaticLine(panel, -1)
+        
         ix = 0
         iy = 1
-        
         sizer.Add(wx.StaticText(panel, -1, 'y = Ax +B'),(iy, ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        
         iy+=1
         sizer.Add(wx.StaticText(panel, -1, 'Param A'),(iy, ix),\
@@ -58 +57 @@
         ix += 1
         sizer.Add(self.tcErrA, (iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-       
         iy += 1
         ix = 0
@@ -108 +106 @@
                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
-       
         panel.SetSizer(sizer)
         self.SetSizer(vbox)
         self.Centre()
+        
         # Receives the type of model for the fitting
         from LineModel import LineModel
         self.model  = LineModel()
-          
           
         #Display the fittings values
@@ -139 +136 @@
             self.PXmin.Disable()
             self.PXmax.Disable()
-       
-        
+    
         # new data for the fit 
         self.file_data1 = Theory1D(x=[], y=[], dy=None)
@@ -158 +154 @@
         #Check if the field of Fit Dialog contain values and use the x max and min of the user
         xmin,xmax = self._checkVal(self.FXmin.GetValue(),self.FXmax.GetValue())
-       
         #store the values of View in x,y, dx,dy
         x,y,dx,dy=self.plottable.returnValuesOfView()
@@ -167 +162 @@
         # makes transformation for y as a line to fit
         if x != []: 
-            
             xminView=self.floatTransform(xmin)
             xmaxView=self.floatTransform(xmax)
@@ -190 +184 @@
                    
             #Find the fitting parameters
-            print "X", tempx
-            print "Y", tempy
             chisqr, out, cov = fittings.sansfit(self.model, 
                             [self.cstA, self.cstB],tempx, tempy,tempdy,xminView,xmaxView)
@@ -211 +203 @@
             self.model.setParam('A', float(cstA))
             self.model.setParam('B', float(cstB))
-            print "this is constant A:",float(cstA)
+            
             tempx = []
             tempy = []
@@ -241 +233 @@
             else: 
                 tempy.append(y_model)
-                
-            
-            print "this max",xmax
-            print "this view xmax", xmaxView
+          
             # Create new data plottable with result
             self.file_data1.x =[] 
@@ -252 +241 @@
             self.file_data1.dx=None
             self.file_data1.dy=None
-            print "this is the min of data1",min(self.file_data1.x )
-            print "this is the max of data1",max(self.file_data1.x )
             #Load the view with the new values
             self.file_data1.reset_view()

guitools/plottables.py

@@ -40 +40 @@
 
 # Support for ancient python versions
+import copy
+import numpy
+
 if 'any' not in dir(__builtins__):
     def any(L):
@@ -434 +437 @@
                 @param errfunc: function to apply to errors
             """
-            import copy
-            import numpy
+            
             
             # Sanity check
@@ -483 +485 @@
                 @param errfunc: function to apply to errors dy
             """
-            import copy
-            import numpy
             # Sanity check
             has_x = False
@@ -589 +589 @@
     def changed(self):
         return False
+    
     @classmethod
     def labels(cls, collection):
@@ -598 +599 @@
         return map
    
-
-
+   
 class Fit1D(Plottable):
     """Fit plottable: composed of a data line plus a theory line.  This

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