Changeset 52611f5 in sasview for sansview/perspectives

Timestamp:

Apr 27, 2009 12:19:11 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:

43d00c4

Parents:

15ff344

Message:

singular point handler for compute chisqr

File:

• sansview/perspectives/fitting/gui_thread.py (modified) (2 diffs)

sansview/perspectives/fitting/gui_thread.py

@@ -52 +52 @@
         """
         self.starttime = time.time()
+       
         x,y = [numpy.asarray(v) for v in (self.x,self.y)]
         if self.dy==None or self.dy==[]:
             self.dy= numpy.zeros(len(self.y))
         self.dy[self.dy==0]=1
+       
         if self.qmin==None:
-            self.qmin= min(self.x)
+            if min (self.x) ==0.0 and self.x[0]==0 and not numpy.isfinite(self.y[0]):
+                self.qmin = min(self.x[sel.x!=0])
+            else:
+                self.qmin= min(self.x)
         
         if self.qmax==None:
@@ -71 +76 @@
                
                 # Check whether we need to bail out
-                self.isquit()   
+                self.isquit()  
+               
                 fx[i_x]=self.model.run(self.x[i_x])
                 
             if self.smearer!=None:
                 fx= self.smearer(fx)
+                
             for i_y in range(len(fx)):
                 # Check whether we need to bail out
                 self.isquit()   
+               
                 temp=(self.y[i_y] - fx[i_y])/self.dy[i_y]
                 res.append(temp*temp)
-            
-            
             #sum of residuals
             sum=0