Changeset f72333f in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

May 10, 2010 6:50:05 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

4fbc93e

Parents:

2d409fa

Message:

Plugged in 2D smear: traditional over-sampling method

File:

• sansview/perspectives/fitting/fitting.py (modified) (18 diffs)

sansview/perspectives/fitting/fitting.py

@@ -44 +44 @@
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
 
-
+from fitpage import Chi2UpdateEvent
 class PlotInfo:
     """
@@ -104 +104 @@
         #dictionary containing data name and error on dy of that data 
         self.err_dy = {}
-        
+        self.theory_data = None      
    
         
@@ -146 +146 @@
         self.fit_panel.set_model_list(self.menu_mng.get_model_list())
         owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel)
-      
+
         #create  menubar items
         return [(id, self.menu1, "Fitting")]
@@ -370 +370 @@
             wx.PostEvent(self.parent, StatusEvent(status="Fitting  \
                 is cancelled" , type="stop"))
+           
+    def set_smearer_nodraw(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
+        """  
+        self.current_pg=self.fit_panel.get_current_page()
+        self.page_finder[self.current_pg].set_smearer(smearer)
+        ## draw model 1D with smeared data
+        data =  self.page_finder[self.current_pg].get_fit_data()
+        model = self.page_finder[self.current_pg].get_model()
+        ## if user has already selected a model to plot
+        ## redraw the model with data smeared
+        
+        smear =self.page_finder[self.current_pg].get_smearer()   
             
     def set_smearer(self,smearer, qmin=None, qmax=None):
@@ -383 +398 @@
         ## if user has already selected a model to plot
         ## redraw the model with data smeared
-        
+
         smear =self.page_finder[self.current_pg].get_smearer()
         if model!= None:
@@ -405 +420 @@
              
         """
-        ## 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)
+
+        if data.__class__.__name__ !="Data2D":    
+            ## draw model 1D with no loaded data
+            self._draw_model1D( model= model, data= data,
+                                                    enable1D=enable1D, 
+                                                    smearer= smearer,
+                                                    qmin= qmin, qmax= qmax, qstep= qstep )
+        else:     
+            ## draw model 2D with no initial data
+             self._draw_model2D(model=model,
+                                      data = data,
+                                      enable2D= enable2D,
+                                      smearer= smearer,
+                                      qmin=qmin,
+                                      qmax=qmax,
+                                      qstep=qstep)
             
     def onFit(self):
@@ -600 +621 @@
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
             return
-    
+
+        
     def _onEVT_SLICER_PANEL(self, event):
         """
@@ -1087 +1109 @@
                 
                 
-    def _complete1D(self, x,y, elapsed,model,data=None):
+    def _complete1D(self, x,y, elapsed,index,model,data=None):
         """
             Complete plotting 1D data
@@ -1106 +1128 @@
            
             title= new_plot.name
+            # x, y are only in range of index 
+            self.theory_data = new_plot
             #new_plot.perspective = self.get_perspective()
             # Pass the reset flag to let the plotting event handler
@@ -1116 +1140 @@
             else:
                 wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,title= str(title)))
+            # Chisqr in fitpage
+            current_pg=self.fit_panel.get_current_page()
+            wx.PostEvent(current_pg,Chi2UpdateEvent(output=self._cal_chisqr(data=data,index=index)))
             msg = "Plot 1D  complete !"
             wx.PostEvent( self.parent, StatusEvent(status=msg , type="stop" ))
@@ -1134 +1161 @@
         
         
-    def _complete2D(self, image,data, model,  elapsed,qmin, qmax,qstep=DEFAULT_NPTS):
+    def _complete2D(self, image,data, model,  elapsed,index,qmin, qmax,qstep=DEFAULT_NPTS):
         """
             Complete get the result of modelthread and create model 2D
@@ -1165 +1192 @@
             theory.xmin= data.xmin
             theory.xmax= data.xmax
-      
-       
+            
+        self.theory_data = theory
         ## plot
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
                          title="Analytical model 2D ", reset=True ))
+        # Chisqr in fitpage
+        current_pg=self.fit_panel.get_current_page()
+        wx.PostEvent(current_pg,Chi2UpdateEvent(output=self._cal_chisqr(data=data,index=index)))
         msg = "Plot 2D complete !"
         wx.PostEvent( self.parent, StatusEvent( status= msg , type="stop" ))
-         
+     
     def _on_data_error(self, event):
         """
@@ -1179 +1209 @@
         """
         self.err_dy = event.err_dy
-        #print "receiving error dy",self.err_dy
          
-    def _draw_model2D(self,model,data=None,description=None, enable2D=False,
+    def _draw_model2D(self,model,data=None, smearer= None,description=None, enable2D=False,
                       qmin=DEFAULT_QMIN, qmax=DEFAULT_QMAX, qstep=DEFAULT_NPTS):
         """
@@ -1208 +1237 @@
                 x= data.x_bins
                 y= data.y_bins
-                
+               
         if not enable2D:
-            return
+            return None,None
         try:
             from model_thread import Calc2D
@@ -1216 +1245 @@
             if self.calc_2D != None and self.calc_2D.isrunning():
                 self.calc_2D.stop()
+
             self.calc_2D = Calc2D(  x= x,
                                     y= y,
                                     model= model, 
                                     data = data,
+                                    smearer = smearer,
                                     qmin= qmin,
                                     qmax= qmax,
@@ -1226 +1257 @@
                                     updatefn= self._update2D )
             self.calc_2D.queue()
-            
+
         except:
             msg= " Error occurred when drawing %s Model 2D: "%model.name
             msg+= " %s"%sys.exc_value
             wx.PostEvent( self.parent, StatusEvent(status= msg ))
-            return  
+
    
     def _draw_model1D(self, model, data=None, smearer= None,
@@ -1257 +1288 @@
         
         if not enable1D:
-            return
+            return 
     
         try:
@@ -1273 +1304 @@
                                   updatefn = self._update1D  )
             self.calc_1D.queue()
-            
+
         except:
             msg= " Error occurred when drawing %s Model 1D: "%model.name
             msg+= " %s"%sys.exc_value
             wx.PostEvent( self.parent, StatusEvent(status= msg ))
-            return  
-            
-
+
+    def _cal_chisqr(self, data=None, index=None): 
+        """
+            Get handy Chisqr using the output from draw1D and 2D, 
+            instead of calling expansive CalcChisqr in guithread
+        """
+        # default chisqr
+        chisqr = None
+        # return None if data == None
+        if data == None: return chisqr
+
+        # Get data: data I, theory I, and data dI in order
+        if data.__class__.__name__ =="Data2D":
+            if index == None: index = numpy.ones(len(data.data),ntype=bool)
+            fn = data.data[index] 
+            gn = self.theory_data.data[index]
+            en = data.err_data[index]
+        else:
+            # 1 d theory from model_thread is only in the range of index
+            if index == None: index = numpy.ones(len(data.y),ntype=bool)
+            
+            fn = data.y[index] 
+            gn = self.theory_data.y
+            en = data.dy[index]
+
+        # residual
+        res = (fn - gn)/en
+        # get chisqr only w/finite
+        chisqr = numpy.average(res[numpy.isfinite(res)]*res[numpy.isfinite(res)])
+
+        return chisqr
+    
+    
 def profile(fn, *args, **kw):
     import cProfile, pstats, os