Changeset 785c8233 in sasview for sansview/perspectives/fitting

Timestamp:

Aug 10, 2009 9:42:20 AM (15 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:

7e752fe

Parents:

fd0d30fd

Message:

modify chisqr calculation to use evaldistribution

Location:

sansview/perspectives/fitting

Files:

• fit_thread.py (modified) (2 diffs)
• gui_thread.py (modified) (2 diffs)
• model_thread.py (modified) (4 diffs)
• sldPanel.py (added)

sansview/perspectives/fitting/fit_thread.py

@@ -146 +146 @@
                           cpage= self.cpage,
                           elapsed=elapsed )
-            
+           
         except KeyboardInterrupt:
             # Thread was interrupted, just proceed and re-raise.
@@ -155 +155 @@
         except :
             #Stop on exception during fitting. Todo: need to put some mssg and reset progress bar.
-            wx.PostEvent(self.parent, StatusEvent(status=" Fit exception occurred..." ,type="stop"))
+            msg= " Fit Error occurred... %s"%sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status= msg,type="stop"))
             #raise
     

sansview/perspectives/fitting/gui_thread.py

@@ -62 +62 @@
         res=[]
         try:
-            res = self.fitdata.residuals(self.model.run)
+            res = self.fitdata.residuals(self.model.evalDistribution)
             sum=0
             for item in res:
@@ -133 +133 @@
         res=[]
         try:
-            res = self.fitdata.residuals(self.model.run)
+            res = self.fitdata.residuals(self.model.evalDistribution)
             sum=0
             for item in res:

sansview/perspectives/fitting/model_thread.py

@@ -54 +54 @@
         index_model = (self.qmin <= radius)&(radius<= self.qmax)
        
-        ## receive only list of 2 numpy array 
-        ## One must reshape to vertical and the other to horizontal
-        value = self.model.evalDistribution([self.y_array,self.x_array] )
-        ## for data ignore the qmax 
-        if self.data == None:
-            # Only qmin value will be consider for the detector
-            output = value *index_data  
-        else:
-            # The user can define qmin and qmax for the detector
-            output = value*index_model
-        
+        try:
+            ## receive only list of 2 numpy array 
+            ## One must reshape to vertical and the other to horizontal
+            value = self.model.evalDistribution([self.y_array,self.x_array] )
+            ## for data ignore the qmax 
+            if self.data == None:
+                # Only qmin value will be consider for the detector
+                output = value *index_data  
+            else:
+                # The user can define qmin and qmax for the detector
+                output = value*index_model
+        except:
+            raise
+           
+       
         elapsed = time.time()-self.starttime
         self.complete( image = output,
@@ -74 +78 @@
                        qstep = self.qstep )
         
-    def compute_point(self):
-        """
-            Compute the data given a model function. Loop through each point
-            of x and y to compute the model
-            @return output : is a matrix of size x*y
-        """
-        output = numpy.zeros((len(self.x),len(self.y)))
-       
-        for i_x in range(len(self.x)):
-            # Check whether we need to bail out
-            self.update(output=output )
-            self.isquit()
-       
-            for i_y in range(int(len(self.y))):
-                radius = math.sqrt(self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y])
-                ## for data ignore the qmax 
-                if self.data == None:
-                    if  self.qmin <= radius :
-                        value = self.model.runXY( [self.x[i_x], self.y[i_y]] )
-                        output[i_y][i_x] =value   
-                    else:
-                        output[i_y][i_x] =0   
-                else:  
-                    if  self.qmin <= radius and radius<= self.qmax:
-                        value = self.model.runXY( [self.x[i_x], self.y[i_y]] )
-                        output[i_y][i_x] =value   
-                    else:
-                        output[i_y][i_x] =0  
-        return output 
-     
+   
     
 
@@ -138 +113 @@
         self.starttime = time.time()
         
-        index= (self.qmin <= self.x)& (self.x <= self.qmax)
-        output = self.model.evalDistribution(self.x[index])
- 
+        try:
+            index= (self.qmin <= self.x)& (self.x <= self.qmax)
+            output = self.model.evalDistribution(self.x[index])
+        except:
+            raise
+            
+
         ##smearer the ouput of the plot    
         if self.smearer!=None:
@@ -150 +129 @@
                 
         elapsed = time.time()-self.starttime
-        
+       
         self.complete(x= self.x, y= output, 
                       elapsed=elapsed, model= self.model, data=self.data)
         
-    def compute_point(self):
-        """
-            Compute the data given a model function. Loop through each point
-            of x  compute the model
-            @return output : is a numpy vector of size x
-        """  
-        output = numpy.zeros(len(self.x))      
-        # Loop through each q of data.x
-        for i_x in range(len(self.x)):
-            self.update(x= self.x, output=output )
-            # Check whether we need to bail out
-            self.isquit()
-            if self.qmin <= self.x[i_x] and self.x[i_x] <= self.qmax:
-                value = self.model.run(self.x[i_x])
-                output[i_x] = value
-                
-        return output
-                
+ 
                 
 class CalcCommandline: