Changeset ca7a626 in sasview

Timestamp:

Mar 27, 2009 11:51:25 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:

4e6b5939

Parents:

eef2e0ed

Message:

combine single fit and simultaneous fit

Location:

sansview/perspectives/fitting

Files:

• fit_thread.py (modified) (3 diffs)
• fitpage.py (modified) (1 diff)
• fitting.py (modified) (15 diffs)
• simfitpage.py (modified) (1 diff)

sansview/perspectives/fitting/fit_thread.py

@@ -102 +102 @@
     """Thread performing the fit """
     
-    def __init__(self,parent, fn,pars=None,cpage=None, qmin=None,qmax=None,
+    def __init__(self,parent, fn,pars=None,cpage=None,
                  completefn = None,
                  updatefn   = None,
@@ -117 +117 @@
         self.pars = pars
         self.starttime = 0
-        
-        self.qmin = qmin
-        self.qmax = qmax
        
         self.done= False
@@ -160 +157 @@
                           pars = self.pars,
                           cpage= self.cpage,
-                          qmin = self.qmin,
-                          qmax = self.qmax,
-                          
                           elapsed=elapsed )
+            
         except KeyboardInterrupt:
             # Thread was interrupted, just proceed and re-raise.

sansview/perspectives/fitting/fitpage.py

@@ -329 +329 @@
         self.qmax_x =float( self.qmax.GetValue())
         
-        self.manager.schedule_for_fit( value=1,fitproblem =None) 
-       
+        self.manager.schedule_for_fit( value=1,page=self,fitproblem =None) 
+        self.manager.set_fit_range(page= self,qmin= self.qmin_x, qmax= self.qmax_x)
         #single fit 
-        self.manager.on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
+        #self.manager.on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
+        self.manager.onFit()
             
         self.sizer5.Layout()

sansview/perspectives/fitting/fitting.py

@@ -235 +235 @@
         return data
 
-
-   
+    def set_fit_range(self, page, qmin, qmax):
+        """
+            Set the fitting range of a given page
+        """
+        if page in self.page_finder.iterkeys():
+            fitproblem= self.page_finder[page]
+            fitproblem.set_range(qmin= qmin, qmax= qmax)
                     
-    def schedule_for_fit(self,value=0,fitproblem =None):  
+    def schedule_for_fit(self,value=0,page=None,fitproblem =None):  
         """
             Set the fit problem field to 0 or 1 to schedule that problem to fit.
@@ -249 +254 @@
             fitproblem.schedule_tofit(value)
         else:
-            current_pg=self.fit_panel.get_current_page() 
-            for page, val in self.page_finder.iteritems():
-                if page ==current_pg :
-                    val.schedule_tofit(value)
-                    break
+            if page in self.page_finder.iterkeys():
+                fitproblem= self.page_finder[page]
+                fitproblem.schedule_tofit(value)
+          
                       
                     
@@ -303 +307 @@
                 is cancelled" , type="stop"))
             
+    
       
-    def on_single_fit(self,id=0,qmin=None, qmax=None):
-        """ 
-            perform fit for the  current page  and return chisqr,out and cov
-            @param engineName: type of fit to be performed
-            @param id: unique id corresponding to a fit problem(model, set of data)
-            @param model: model to fit
-            
-        """
-        #set an engine to perform fit
-        from sans.fit.Fitting import Fit
-        self.fitter = Fit(self._fit_engine)
-        #Setting an id to store model and data in fit engine
-        self.fit_id = id
-       
-        page_fitted = None
-        
-        #Get information (model , data) related to the page on 
-        #with the fit will be perform
-        current_pg= self.fit_panel.get_current_page() 
-        simul_pg= self.sim_page
-        pars=[]   
-        ## Check that the current page is different from self.sim_page
-        if current_pg != simul_pg:
-            value = self.page_finder[current_pg]
-            metadata =  value.get_fit_data()
-            model = value.get_model()
-            smearer = value.get_smearer()
-           
-            #Create list of parameters for fitting used
-            templist=[]
-            try:
-                ## get the list of parameter names to fit
-                templist = current_pg.get_param_list()
-            
-                for element in templist:
-                    pars.append(str(element[1]))
-    
-                pars.sort()
-                #Do the single fit
-                self.fitter.set_model(Model(model), self.fit_id, pars)
-                dy=[]
-                x=[]
-                y=[]
-                ## checking the validity of error
-                if metadata.__class__ in  ["Data1D","Theory1D"]:
-                    for i in range(len(metadata.dy)):
-                        if metadata.dy[i] !=0:
-                            dy.append(metadata.dy[i])
-                            x.append(metadata.x[i])
-                            y.append(metadata.y[i])
-                    if len(dy)>0:        
-                        metadata.dy=numpy.zeros(len(dy))
-                        metadata.dy=dy
-                        metadata.y=numpy.zeros(len(y))
-                        metadata.y=y
-                        metadata.x=numpy.zeros(len(x))
-                        metadata.x=x
-               
-                self.fitter.set_data(data=metadata,Uid=self.fit_id,
-                                     smearer=smearer,qmin= qmin,qmax=qmax )
-                
-                self.fitter.select_problem_for_fit(Uid= self.fit_id,
-                                                   value= value.get_scheduled())
-                page_fitted=current_pg
-               
-            except:
-                msg= "Single Fit error: %s" % sys.exc_value
-                wx.PostEvent(self.parent, StatusEvent(status= msg ))
-                return
-            # make sure to keep an alphabetic order 
-            #of parameter names in the list      
-            try:
-                ## If a thread is already started, stop it
-                if self.calc_fit!= None and self.calc_fit.isrunning():
-                    self.calc_fit.stop()
-                        
-                self.calc_fit=FitThread(parent =self.parent,
-                                            fn= self.fitter,
-                                            pars= pars,
-                                            cpage= page_fitted,
-                                           qmin=qmin,
-                                           qmax=qmax,
-                                          
-                                           completefn=self._single_fit_completed,
-                                           updatefn=None)
-                self.calc_fit.queue()
-                self.calc_fit.ready(2.5)
+    def set_smearer(self,smearer, qmin=None, qmax=None):
+        """
+            Get a smear object and store it to a fit problem
+            @param smearer: smear object to allow smearing data
+        """   
+        current_pg=self.fit_panel.get_current_page()
+        self.page_finder[current_pg].set_smearer(smearer)
+        ## draw model 1D with smeared data
+        data =  self.page_finder[current_pg].get_plotted_data()
+        model = self.page_finder[current_pg].get_model()
+        ## if user has already selected a model to plot
+        ## redraw the model with data smeared
+        
+        smearer =self.page_finder[current_pg].get_smearer()
+        if smearer != None:
+            self.draw_model( model=model, data= data, smearer= smearer,
+                qmin= qmin, qmax= qmax)
+
+    
+    
+    def draw_model(self, model, data= None,smearer= None,
+                   enable1D= True, enable2D= False,
+                   qmin= DEFAULT_QMIN, qmax= DEFAULT_QMAX, qstep= DEFAULT_NPTS):
+        """
+             Draw model.
+             @param model: the model to draw
+             @param name: the name of the model to draw
+             @param data: the data on which the model is based to be drawn
+             @param description: model's description
+             @param enable1D: if true enable drawing model 1D
+             @param enable2D: if true enable drawing model 2D
+             @param qmin:  Range's minimum value to draw model
+             @param qmax:  Range's maximum value to draw model
+             @param qstep: number of step to divide the x and y-axis
              
-            except:
-                wx.PostEvent(self.parent, StatusEvent(status="Single Fit error: %s" % sys.exc_value))
-                return
-         
-    def on_simul_fit(self, id=0,qmin=None,qmax=None):
-        """ 
-            perform fit for all the pages selected on simpage and return chisqr,out and cov
-            @param engineName: type of fit to be performed
-            @param id: unique id corresponding to a fit problem(model, set of data)
-             in park_integration
-            @param model: model to fit
-            
-        """
-        ##Setting an id to store model and data
-        self.fit_id= id
-        
+        """
+        ## draw model 1D with no loaded data
+        self._draw_model1D( model= model, data= data,enable1D=enable1D, smearer= smearer,
+                           qmin= qmin, qmax= qmax, qstep= qstep )
+        ## draw model 2D with no initial data
+        self._draw_model2D(model=model,
+                           data = data,
+                           enable2D= enable2D,
+                           qmin=qmin,
+                           qmax=qmax,
+                           qstep=qstep)
+        
+    def onFit(self):
+        """
+            perform fit 
+        """
         ##  count the number of fitproblem schedule to fit 
         fitproblem_count= 0
@@ -420 +372 @@
         self.fitter= Fit(self._fit_engine)
         
-        
+        if self._fit_engine=="park":
+            engineType="Simutaneous Fit"
+        else:
+            engineType="Single Fit"
+            
+        fproblemId = 0
+        current_pg=None
         for page, value in self.page_finder.iteritems():
             try:
                 if value.get_scheduled()==1:
-                    metadata = value.get_fit_data()
-                    model = value.get_model()
-                    smearer = value.get_smearer()
-                    qmin , qmax = value.get_range()
-                    ## store page
-                    cpage= page
                     #Get list of parameters name to fit
                     pars = []
@@ -435 +387 @@
                     templist = page.get_param_list()
                     for element in templist:
-                        try:
-                            name = str(element[0].GetLabelText())
-                            pars.append(name)
-                        except:
-                            wx.PostEvent(self.parent, StatusEvent(status="Simultaneous Fit error: %s" % sys.exc_value))
-                            return
-                    ## create a park model and reset parameter value if constraint
-                    ## is given
-                    new_model = Model(model)
-                    param = value.get_model_param()
-                    if len(param)>0:
-                        for item in param:
-                            param_value = item[1]
-                            param_name = item[0]
-                            ## check if constraint
-                            if param_value !=None and param_name != None:
-                                new_model.parameterset[ param_name].set( param_value )
-                    self.fitter.set_model(model= new_model, Uid=self.fit_id, pars=pars) 
-                    ## check that non -zero value are send as dy in the fit engine
-                    dy=[]
-                    x=[]
-                    y=[]
-                    if metadata.__class__ in  ["Data1D","Theory1D"]:
-                        for i in range(len(metadata.dy)):
-                            if metadata.dy[i] !=0:
-                                dy.append(metadata.dy[i])
-                                x.append(metadata.x[i])
-                                y.append(metadata.y[i])
-                            if len(dy)>0:        
-                                metadata.dy=numpy.zeros(len(dy))
-                                metadata.dy=dy
-                                metadata.y=numpy.zeros(len(y))
-                                metadata.y=y
-                                metadata.x=numpy.zeros(len(x))
-                                metadata.x=x
-                              
-                    self.fitter.set_data( data= metadata, smearer=smearer,
-                                         Uid=self.fit_id, qmin=qmin, qmax=qmax)
-                    self.fitter.select_problem_for_fit(Uid= self.fit_id,
-                                                       value= value.get_scheduled())
-                    self.fit_id += 1 
-                    value.clear_model_param()
-                   
+                        name = str(element[0].GetLabelText())
+                        pars.append(name)
+                    #Set Engine  (model , data) related to the page on 
+                    self._fit_helper( current_pg=page, value=value,pars=pars,
+                                      id=fproblemId, title= engineType ) 
+                    fproblemId += 1 
+                    current_pg= page
             except:
-                msg= "Simultaneous Fit error: %s" % sys.exc_value
+                msg= "%s error: %s" % (engineType,sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status= msg ))
                 return 
-            
         #Do the simultaneous fit
         try:
@@ -488 +403 @@
             if self.calc_fit!= None and self.calc_fit.isrunning():
                 self.calc_fit.stop()
-                        ## perform single fit
-            if  fitproblem_count==1:
+            ## perform single fit
+            if self._fit_engine=="scipy":
+                qmin, qmax= current_pg.get_range()
                 self.calc_fit=FitThread(parent =self.parent,
                                         fn= self.fitter,
-                                       qmin=qmin,
-                                       qmax=qmax,
-                                       cpage=cpage,
+                                       cpage=current_pg,
                                        pars= pars,
-                                       completefn= self._simul_fit_completed,
+                                       completefn= self._single_fit_completed,
                                        updatefn=None)
                       
@@ -503 +417 @@
                 self.calc_fit=FitThread(parent =self.parent,
                                         fn= self.fitter,
-                                       qmin=qmin,
-                                       qmax=qmax,
                                        completefn= self._simul_fit_completed,
                                        updatefn=None)
@@ -511 +423 @@
             
         except:
-            msg= "Simultaneous Fit error: %s" % sys.exc_value
+            msg= "%s error: %s" % (engineType,sys.exc_value)
             wx.PostEvent(self.parent, StatusEvent(status= msg ))
-            return
-      
-    def set_smearer(self,smearer, qmin=None, qmax=None):
-        """
-            Get a smear object and store it to a fit problem
-            @param smearer: smear object to allow smearing data
-        """   
-        current_pg=self.fit_panel.get_current_page()
-        self.page_finder[current_pg].set_smearer(smearer)
-        ## draw model 1D with smeared data
-        data =  self.page_finder[current_pg].get_plotted_data()
-        model = self.page_finder[current_pg].get_model()
-        ## if user has already selected a model to plot
-        ## redraw the model with data smeared
-        
-        smearer =self.page_finder[current_pg].get_smearer()
-        if smearer != None:
-            self.draw_model( model=model, data= data, smearer= smearer,
-                qmin= qmin, qmax= qmax)
-
-    
-    
-    def draw_model(self, model, data= None,smearer= None,
-                   enable1D= True, enable2D= False,
-                   qmin= DEFAULT_QMIN, qmax= DEFAULT_QMAX, qstep= DEFAULT_NPTS):
-        """
-             Draw model.
-             @param model: the model to draw
-             @param name: the name of the model to draw
-             @param data: the data on which the model is based to be drawn
-             @param description: model's description
-             @param enable1D: if true enable drawing model 1D
-             @param enable2D: if true enable drawing model 2D
-             @param qmin:  Range's minimum value to draw model
-             @param qmax:  Range's maximum value to draw model
-             @param qstep: number of step to divide the x and y-axis
-             
-        """
-        ## draw model 1D with no loaded data
-        self._draw_model1D( model= model, data= data,enable1D=enable1D, smearer= smearer,
-                           qmin= qmin, qmax= qmax, qstep= qstep )
-        ## draw model 2D with no initial data
-        self._draw_model2D(model=model,
-                           data = data,
-                           enable2D= enable2D,
-                           qmin=qmin,
-                           qmax=qmax,
-                           qstep=qstep)
-          
-    def _fit_helper(self,current_pg, id ):
+            return 
+              
+       
+        
+        
+        
+        
+    def _fit_helper(self,current_pg,pars,value, id, title="Single Fit " ):
         """
             helper for fitting
         """
-        #set an engine to perform fit
-        from sans.fit.Fitting import Fit
-        self.fitter = Fit(self._fit_engine)
-        #Setting an id to store model and data in fit engine
-        self.fit_id = id
-        page_fitted = None
-        pars=[]   
-        value = self.page_finder[current_pg]
-        metadata =  value.get_fit_data()
+        metadata = value.get_fit_data()
         model = value.get_model()
         smearer = value.get_smearer()
-       
+        qmin , qmax = value.get_range()
+        self.fit_id =id
         #Create list of parameters for fitting used
         templist=[]
+        pars=pars
         try:
-            ## get the list of parameter names to fit
-            templist = current_pg.get_param_list()
-        
-            for element in templist:
-                pars.append(str(element[1]))
-
-            pars.sort()
             ## create a park model and reset parameter value if constraint
             ## is given
@@ -599 +456 @@
                     if param_value !=None and param_name != None:
                         new_model.parameterset[ param_name].set( param_value )
-        
+            
+            
             #Do the single fit
             self.fitter.set_model(new_model, self.fit_id, pars)
@@ -622 +480 @@
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
                                  smearer=smearer,qmin= qmin,qmax=qmax )
-            
+           
             self.fitter.select_problem_for_fit(Uid= self.fit_id,
                                                value= value.get_scheduled())
-            page_fitted=current_pg
            
         except:
-            msg= "Single Fit error: %s" % sys.exc_value
+            msg= title +" error: %s" % sys.exc_value
             wx.PostEvent(self.parent, StatusEvent(status= msg ))
             return
@@ -679 +536 @@
                     return
     
-    def _single_fit_completed(self,result,pars,cpage,qmin,qmax,elapsed=None):
+    def _single_fit_completed(self,result,pars,cpage, elapsed=None):
         """
             Display fit result on one page of the notebook.
@@ -689 +546 @@
           
         """
-        wx.PostEvent(self.parent, StatusEvent(status="Single fit \
-        complete! " , type="stop"))
+        #wx.PostEvent(self.parent, StatusEvent(status="Single fit \
+        #complete! " , type="stop"))
         try:
             for page, value in self.page_finder.iteritems():
@@ -708 +565 @@
             metadata =  self.page_finder[cpage].get_fit_data()
             model = self.page_finder[cpage].get_model()
-           
+            qmin, qmax= self.page_finder[cpage].get_range()
             #Replot models
             msg= "Single Fit completed. plotting... %s:"%model.name
@@ -720 +577 @@
        
        
-    def _simul_fit_completed(self,result,qmin,qmax, elapsed=None,pars=None,cpage=None):
+    def _simul_fit_completed(self,result,pars=None,cpage=None, elapsed=None):
         """
             Parameter estimation completed, 
@@ -727 +584 @@
             @param elapsed: computation time
         """
-        if cpage!=None:
-            self._single_fit_completed(result=result, pars=pars, cpage=cpage,
-                                       qmin=qmin, qmax=qmax)
-            return
-        else:
-            wx.PostEvent(self.parent, StatusEvent(status="Simultaneous fit \
-            complete ", type="stop"))
-           
-            ## fit more than 1 model at the same time 
-            try:
-                for page, value in self.page_finder.iteritems():
-                    if value.get_scheduled()==1:
-                        model = value.get_model()
-                        metadata =  value.get_plotted_data()
-                        small_out = []
-                        small_cov = []
-                        i = 0
-                        #Separate result in to data corresponding to each page
-                        for p in result.parameters:
-                            model_name,param_name = self.split_string(p.name)  
-                            if model.name == model_name:
-                                p_name= model.name+"."+param_name
-                                if p.name == p_name:
-                                    small_out.append(p.value )
-                                    model.setParam(param_name,p.value) 
-                                    if p.stderr==None:
-                                        p.stderr=numpy.nan
-                                        small_cov.append(p.stderr)
-                                       
-                                    else:
-                                        small_cov.append(p.stderr)
+        wx.PostEvent(self.parent, StatusEvent(status="Simultaneous fit \
+        complete ", type="stop"))
+       
+        ## fit more than 1 model at the same time 
+        try:
+            for page, value in self.page_finder.iteritems():
+                if value.get_scheduled()==1:
+                    model = value.get_model()
+                    metadata =  value.get_plotted_data()
+                    small_out = []
+                    small_cov = []
+                    i = 0
+                    #Separate result in to data corresponding to each page
+                    for p in result.parameters:
+                        model_name,param_name = self.split_string(p.name)  
+                        if model.name == model_name:
+                            p_name= model.name+"."+param_name
+                            if p.name == p_name:
+                                small_out.append(p.value )
+                                model.setParam(param_name,p.value) 
+                                if p.stderr==None:
+                                    p.stderr=numpy.nan
+                                    small_cov.append(p.stderr)
+                                   
                                 else:
-                                    value= model.getParam(param_name)
-                                    small_out.append(value )
-                                    small_cov.append(numpy.nan)
-                                
-                        # Display result on each page 
-                        page.onsetValues(result.fitness, small_out,small_cov)
-                        #Replot models
-                        msg= "Simultaneous Fit completed. plotting... %s:"%model.name
-                        wx.PostEvent(self.parent, StatusEvent(status="%s " % msg))
-                        self.draw_model( model=model, data= metadata,qmin= qmin, qmax= qmax)
-                        
-            except:
-                 msg= "Simultaneous Fit completed but Following error occurred: "
-                 wx.PostEvent(self.parent, StatusEvent(status="%s%s" %(msg,sys.exc_value)))
-                 return 
+                                    small_cov.append(p.stderr)
+                            else:
+                                value= model.getParam(param_name)
+                                small_out.append(value )
+                                small_cov.append(numpy.nan)
+                    # Display result on each page 
+                    page.onsetValues(result.fitness, small_out,small_cov)
+                    #Replot models
+                    msg= "Simultaneous Fit completed. plotting... %s:"%model.name
+                    wx.PostEvent(self.parent, StatusEvent(status="%s " % msg))
+                    qmin, qmax= page.get_range()
+                    self.draw_model( model=model, data= metadata,qmin= qmin, qmax= qmax)
+                    
+        except:
+             msg= "Simultaneous Fit completed but Following error occurred: "
+             wx.PostEvent(self.parent, StatusEvent(status="%s%s" %(msg,sys.exc_value)))
+             return 
              
                            

sansview/perspectives/fitting/simfitpage.py

@@ -125 +125 @@
         ## model was actually selected from this page to be fit
         if len(self.model_toFit) >= 1 :
-            self.manager.on_simul_fit()
+            self.manager.onFit()
         else:
             msg= "Select at least one model to fit "