Changeset 5789654 in sasview for guitools/fitDialog.py

Timestamp:

Apr 7, 2008 4:31:09 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:

8742751

Parents:

fcaada5

Message:

modied fitdialog property dialog added fittings , modified plottables

File:

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

guitools/fitDialog.py

@@ -89 +89 @@
         # new data for the fit 
         self.file_data1 = Theory1D(x=[], y=[], dy=None)
-        self.file_data1.name = "y= exp(A + bx**2)"
+        self.file_data1.name = "Fit"
         
     def _onFit(self ,event):
@@ -95 +95 @@
         print "we are on fit"
         temp =[]
-        tempdx =[]
-        tempdy =[]
         xmin = self._checkVal(self.tcXmin.GetValue())
         xmax = self._checkVal(self.tcXmax.GetValue())
-        #x= self.plottable.view.x
-        x=self.plottable.returnXvalueOfView()
-        print "x value :" ,x
+        
+        #store the values of View in x,y, dx,dy
+        x,y,dx,dy=self.plottable.returnValuesOfView()
+       
         if x != []:
             if xmin !=None  and xmax != None:
@@ -107 +106 @@
                     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)) 
@@ -114 +113 @@
                 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(x)))
                     self.tcXmax.SetValue(str(max(x)))
@@ -124 +121 @@
             self.file_data1.x =x
             self.file_data1.y =temp
-            #self.file_data1.dx=tempdx
+          
             self.file_data1.dx=None
-            #self.file_data1.dy=tempdy
             self.file_data1.dy=None
-            
+            self.file_data1.reset_view()
         
             # Display the fittings values
@@ -136 +132 @@
             cstB  = fittings.Parameter(self.model, 'B', default_B)        
             chisqr, out, cov = fittings.sansfit(self.model, 
-                [cstA, cstB], self.plottable.view.x, 
-                self.plottable.view.y, self.plottable.view.dy,xmin,xmax)
-            # Create new data plottable with result
+               [cstA, cstB],x, y,dy,min(x),max(x))
             
-            self.file_data1.y = []
-            #for x_i in self.file_data1.x:
-            for x_i in self.file_data1.x:
-                self.file_data1.y.append(self.model.run(x_i))
-                
-            self.push_data(self.file_data1)
+           
+            #Check that cov and out are iterable before displaying them
             if cov ==None:
                 errA =str(0.0)
@@ -158 +148 @@
                 cstA=str(out[0])
                 cstB=str(out[1])
+           
+            self.model.setParam('A', float(cstA))
+            self.model.setParam('B', float(cstB))
+             # Create new data plottable with result
+            self.file_data1.y = []
+           
+            for x_i in x:
+                self.file_data1.y.append(self.model.run(x_i))
+            #Send the data to display to the PlotPanel
+            self.file_data1.reset_view()
+            self.push_data(self.file_data1)
+            # Display the fitting value on the Fit Dialog
             self._onsetValues(cstA, cstB, errA,errB,str(chisqr))