Changeset 26bf293 in sasview for sansview/perspectives/fitting/old_fitting.py

Timestamp:

Feb 2, 2009 7:28:06 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:

ca88b2e

Parents:

2cf2b87

Message:

redesign the model1D and madel page

File:

• sansview/perspectives/fitting/old_fitting.py (moved) (moved from sansview/perspectives/fitting/new_fitting.py) (11 diffs)

sansview/perspectives/fitting/old_fitting.py

@@ -8 +8 @@
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
 from sans.guicomm.events import EVT_SLICER_PANEL,EVT_MODEL2D_PANEL
+from sans.guiframe.model_thread import Calc2D
+from sans.guiframe.calcthread import CalcThread
+
 
 from sans.fit.AbstractFitEngine import Model,Data,FitData1D,FitData2D
@@ -320 +323 @@
                         if model.name == model_name:
                             small_out.append(p.value )
-                            small_cov.append(p.stderr)
+                            if p.stderr ==None:
+                                small_cov.append(0)
+                            else:
+                                small_cov.append(p.stderr)
                             model.setParam(param_name,p.value)  
                     # Display result on each page 
@@ -359 +365 @@
                 model=list[0]
                 smearer= value.get_smearer()
-                print "single fit", model, smearer
                 #Create list of parameters for fitting used
                 pars=[]
@@ -379 +384 @@
                     self.schedule_for_fit( 0,value) 
                 except:
-                    raise 
-                    #wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+                    #raise 
+                    wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                     return
                 # make sure to keep an alphabetic order 
@@ -407 +412 @@
            
         except:
-            raise
+            #raise
             wx.PostEvent(self.parent, StatusEvent(status="Single Fit error: %s" % sys.exc_value))
             return
@@ -517 +522 @@
         name = evt.name
         
-        sim_page=self.fit_panel.GetPage(0)
+        sim_page=self.fit_panel.get_page(0)
         current_pg = self.fit_panel.get_current_page() 
+        selected_page = self.fit_panel.get_selected_page()
         if current_pg != sim_page:
             current_pg.set_panel(model)
@@ -559 +565 @@
             @param currpage: page in a dictionary referring to some data
         """
-        if self.fit_panel.GetPageCount() >1:
+        if self.fit_panel.get_page_count() >1:
             for page in self.page_finder.iterkeys():
                 if  page==currpage :  
@@ -635 +641 @@
                     
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
-                for i in range(len(data.y_bins)):
-                    if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
-                        for j in range(len(data.x_bins)):
-                            if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
-                                theory.data[j][i]=model.runXY([data.x_bins[j],data.y_bins[i]])
-               
+                for i in range(len(data.x_bins)):
+                    if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
+                        for j in range(len(data.y_bins)):
+                            if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
+                                theory.data[j][i]=model.runXY([data.x_bins[i],data.y_bins[j]])
+
                 #print "fitting : plot_helper:", theory.image
                 #print data.image
@@ -673 +679 @@
         self.fit_panel.add_model_page(model,description,name,topmenu=True)
         
-    def draw_model(self,model,name ,data=None,description=None,enable1D=True, enable2D=False,
+    def draw_model(self,model,name ,description=None,enable1D=True, enable2D=False,
                    qmin=DEFAULT_QMIN, qmax=DEFAULT_QMAX, qstep=DEFAULT_NPTS):
         """
              draw model with default data value
         """
-        if data !=None:
-            self.redraw_model(qmin,qmax)
-            return 
         self._draw_model2D(model=model,
                            description=model.description,
@@ -741 +744 @@
     
     def complete(self, output, elapsed, model, qmin, qmax,qstep=DEFAULT_NPTS):
-       
+  
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
         complete in %g sec" % elapsed))
@@ -794 +797 @@
         self.model= model
         if enable2D:
-            from model_thread import Calc2D
+            
             self.calc_thread = Calc2D(parent =self.parent,x=x,
                                        y=y,model= self.model,