Changeset cb190a19 in sasview

Timestamp:

May 24, 2010 9:56:13 AM (15 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:

75a8723

Parents:

5cc7001

Message:

cleaned up chisqr left-over

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• gui_thread.py (deleted)

sansview/perspectives/fitting/fitpage.py

@@ -1963 +1963 @@
         except:
             pass  
-        
-    def complete_chisqr(self, output, elapsed=None):  
-        """
-            print result chisqr
-        """
-        try:
-            if output ==None:
-                output= "-"
-
-            self.tcChi.SetValue(str(format_number(output)))
-
-            self.state.tcChi =self.tcChi
-
-        except:
-            pass
-        
-        
-    def compute_chisqr1D(self, smearer=None):
-        """
-            Compute chisqr for 1D
-        """
-        try:
-            self.qmin_x = float(self.qmin.GetValue())
-            self.qmax_x = float(self.qmax.GetValue())
-            ##return residuals within self.qmin_x and self.qmax_x
-            from gui_thread import CalcChisqr1D
-            ## If a thread is already started, stop it
-            if self.calc_Chisqr!= None and self.calc_Chisqr.isrunning():
-                self.calc_Chisqr.stop()
-                
-            self.calc_Chisqr= CalcChisqr1D( data1d= self.data,
-                                            model= self.model,
-                                            smearer=smearer,
-                                            qmin=self.qmin_x,
-                                            qmax=self.qmax_x,
-                                            completefn = self.complete_chisqr,
-                                            updatefn   = None)
-    
-            self.calc_Chisqr.queue()
-            
-        except:
-            raise ValueError," Could not compute Chisqr for %s Model 2D: "%self.model.name
-           
-            
-   
-        
-        
-    def compute_chisqr2D(self,smearer=None):
-        """ 
-            compute chi square given a model and data 2D and set the value
-            to the tcChi txtcrl
-        """
-        try:
-            self.qmin_x = float(self.qmin.GetValue())
-            self.qmax_x = float(self.qmax.GetValue())
-           
-            ##return residuals within self.qmin_x and self.qmax_x
-            from gui_thread import CalcChisqr2D
-            ## If a thread is already started, stop it
-            if self.calc_Chisqr!= None and self.calc_Chisqr.isrunning():
-                self.calc_Chisqr.stop()
-            if smearer !=None:
-                smearer.set_accuracy(accuracy = self.smear2d_accuracy)
-            self.calc_Chisqr= CalcChisqr2D( data2d= self.data,
-                                            model= self.model,
-                                            smearer=smearer,
-                                            qmin= self.qmin_x,
-                                            qmax = self.qmax_x,
-                                            completefn = self.complete_chisqr,
-                                            updatefn   = None)
-    
-            self.calc_Chisqr.queue()
-          
-        except:
-           raise
-
-        
-    def compute_chisqr(self ,output=None, smearer=None):
-        """ 
-            compute chi square given a model and data 1D and set the value
-            to the tcChi txtcrl
-        """
-        flag = self._validate_qrange( self.qmin, self.qmax)
-        if flag== True:
-            try:
-                if hasattr(self.data,"data"):
-                    self.compute_chisqr2D(smearer=smearer)
-                    return
-                else:
-                    self.compute_chisqr1D(smearer=smearer)
-                    return
-            except:
-                wx.PostEvent(self.parent.parent, StatusEvent(status=\
-                            "Chisqr Error: %s"% sys.exc_value))
-                return