Changeset e40b651 in sasview for guitools

Timestamp:

Mar 31, 2008 3:51:17 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:

8e4516f

Parents:

6cfe703

Message:

fixing load file

File:

• guitools/fitDialog.py (modified) (8 diffs)

guitools/fitDialog.py

@@ -4 +4 @@
 
 import wx
-from sans.guitools.PlotPanel import PlotPanel
-
+from PlotPanel import PlotPanel
+from plottables import Theory1D
+import math,pylab,fittings
 class LinearFit(wx.Dialog):
-    def __init__(self, parent, id, title):
+    #def __init__(self, parent, id, title):
+    def __init__(self, parent, plottable, push_data, id, title):
         wx.Dialog.__init__(self, parent, id, title, size=(500, 300))
         """
@@ -13 +15 @@
         """
         self.parent = parent
+        #dialog panel self call function to plot the fitting function
+        self.push_data = push_data
+        #dialog self plottable
+        self.plottable = plottable
+        
+        #Dialog interface
         panel = wx.Panel(self, -1, style=wx.SIMPLE_BORDER)   
         vbox  = wx.BoxSizer(wx.VERTICAL)
@@ -40 +48 @@
         ix += 1
         sizer.Add(self.tcErrA, (iy, ix))
-        #self.tcErrA.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         iy += 1
         ix = 1
@@ -46 +53 @@
         ix += 1
         sizer.Add(self.tcB, (iy, ix))
-        #self.tcB.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         ix += 1
-        # sizer.Add(wx.StaticText(panel, -1, '+/-'),(iy, ix))
+        sizer.Add(wx.StaticText(panel, -1, '+/-'),(iy, ix))
         ix += 1
         sizer.Add(self.tcErrB, (iy, ix))
-        self.tcErrB.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         iy += 1
         ix = 1
@@ -57 +62 @@
         ix += 1
         sizer.Add(self.tcChi, (iy, ix))
-        #self.tcChi.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         iy += 1
         ix = 1
@@ -66 +70 @@
         ix = 1
         sizer.Add(self.tcXmin, (iy, ix))
-        #self.tcXmin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         ix += 2
         sizer.Add(self.tcXmax, (iy, ix))
-        #self.tcXmax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         iy += 1
         ix = 1
         sizer.Add(self.btFit, (iy, ix))
-        self.tcXmax.Bind(wx.EVT_KILL_FOCUS, self._onFit)
+        self.btFit.Bind(wx.EVT_BUTTON, self._onFit)
         ix += 2
         sizer.Add(btClose, (iy, ix))
@@ -80 +82 @@
         self.SetSizer(vbox)
         self.Centre()
+        # Receives the type of model for the fitting
+        from LineModel import LineModel
+        self.model  = LineModel()
+        # new data for the fit 
+        self.file_data1 = Theory1D(x=[], y=[], dy=None)
+        self.file_data1.name = "y= exp(A + bx**2)"
+        
     def _onFit(self ,event):
-         param_evt1 = PlotPanel.FunctionFitEvent(\
-            Xmin=self._checkVal(self.tcXmin.GetValue()),\
-            Xmax=self._checkVal(self.tcXmax.GetValue())                                     )
-         wx.PostEvent(self, param_evt1)
-    
+       
+        print "we are on fit"
+        temp =[]
+        tempdx =[]
+        tempdy =[]
+        xmin = self._checkVal(self.tcXmin.GetValue())
+        xmax = self._checkVal(self.tcXmax.GetValue())
+        x= self.plottable.x
+        if x:
+            if xmin !=None  and xmax != None:
+                for j in range(len(x)):
+                    if x[j]>xmin and x[j]<xmax:
+                        temp.append(self.model.run(x[j]))
+                        tempdx.append(math.sqrt(x[j]))
+                        for y_i in temp:
+                            tempdy.append(math.sqrt(y_i)) 
+            else:
+                # x has a default value in case the user doesn't load data
+                for x_i in x:
+                    temp.append(self.model.run(x_i))
+                    tempdx.append(math.sqrt(x_i))
+                for y_i in temp:
+                    tempdy.append(math.sqrt(y_i))
+                    self.tcXmin.SetValue(str(min(self.plottable.x)))
+                    self.tcXmax.SetValue(str(max(self.plottable.x)))
+                    xmin = self._checkVal(self.tcXmin.GetValue())
+                    xmax = self._checkVal(self.tcXmax.GetValue())
+                
+            self.file_data1.x =x
+            self.file_data1.y =temp
+            self.file_data1.dx=tempdx
+            self.file_data1.dy=tempdy
+            
+        
+            # Display the fittings values
+            default_A = self.model.getParam('A') 
+            default_B = self.model.getParam('B') 
+            cstA = fittings.Parameter(self.model, 'A', default_A)
+            cstB  = fittings.Parameter(self.model, 'B', default_B)        
+            chisqr, out, cov = fittings.sansfit(self.model, 
+                [cstA, cstB], self.plottable.x, 
+                self.plottable.y, self.plottable.dy,xmin,xmax)
+            # Create new data plottable with result
+            
+            self.file_data1.y = []
+            for x_i in self.file_data1.x:
+                self.file_data1.y.append(self.model.run(x_i))
+                
+            self.push_data(self.file_data1)
+            
+            self._onsetValues(str(out[0]),str(out[1]),\
+            str(math.sqrt(cov[0][0])),str(math.sqrt(cov[1][1])),str(chisqr))
+       
     def _onsetValues(self,cstA,cstB,errA,errB,Chi):
         
@@ -93 +150 @@
          self.tcErrB.SetValue(cstA)
          self.tcChi.SetValue(Chi)
-    def _getXrange(self):
-        if self.tcXmin.GetValue() and self.tcXmax.GetValue():
-            return float(),float(self.tcXmax.GetValue())
-        else:
-            return None, None
+         
+    def _returnPlottable(self):
+        return self.file_data1
+    
     def _checkVal(self,value):
         """