Changeset d5b488b in sasview

Timestamp:

Apr 29, 2009 8:00:22 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:

d37ba31

Parents:

3c939e5

Message:

compute residual rejecting singular point for 1D fitting

File:

• park_integration/AbstractFitEngine.py (modified) (2 diffs)

park_integration/AbstractFitEngine.py

@@ -257 +257 @@
             dy= copy.deepcopy(self.dy)
             dy= numpy.asarray(dy)
+     
         dy[dy==0]=1
-        idx = (x>=self.qmin) & (x <= self.qmax)
+        #idx = (x>=self.qmin) & (x <= self.qmax)
   
         # Compute theory data f(x)
-        fx = numpy.zeros(len(x))
-        fx[idx] = numpy.asarray([fn(v) for v in x[idx]])
-        
-        # Smear theory data
-     
+        #fx = numpy.zeros(len(x))
+        tempy=[]
+        tempfx=[]
+        tempdy=[]
+        #fx[idx] = numpy.asarray([fn(v) for v in x[idx]])
+        for i_x in  range(len(x)):
+            try:
+                if self.qmin <=x[i_x] and x[i_x]<=self.qmax:
+                    value= fn(x[i_x])
+                    tempfx.append( value)
+                    tempy.append(y[i_x])
+                    tempdy.append(dy[i_x])
+            except:
+                ## skip error for model.run(x)
+                pass
+                 
+        ## Smear theory data
         if self.smearer is not None:
-            fx = self.smearer(fx)
-       
-        # Sanity check
-        if numpy.size(dy) < numpy.size(x):
+            tempfx = self.smearer(tempfx)
+        newy= numpy.asarray(tempy)
+        newfx= numpy.asarray(tempfx)
+        newdy= numpy.asarray(tempdy)
+       
+       
+        ## Sanity check
+        if numpy.size(newdy)!= numpy.size(newfx):
             raise RuntimeError, "FitData1D: invalid error array"
-        return (y[idx] - fx[idx])/dy[idx]
+        #return (y[idx] - fx[idx])/dy[idx]
+       
+        return (newy- newfx)/newdy
      
   
@@ -395 +414 @@
         self.model.setParams(self.paramlist,params)
         self.res= self.data.residuals(self.model.eval)
-        #if self.curr_thread != None :
-        #    try:
-        #        self.curr_thread.isquit()
-        #    except:
-        #        raise FitAbort,"stop leastsqr optimizer" 
+        if self.curr_thread != None :
+            try:
+                self.curr_thread.isquit()
+            except:
+                raise FitAbort,"stop leastsqr optimizer" 
+                
         return self.res