Changeset 4331b05e in sasview

Timestamp:

Jul 6, 2009 5:01:12 PM (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:

27fea3f

Parents:

e7b1ccf

Message:

allow fit with smearing for range different of range of data

File:

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

park_integration/AbstractFitEngine.py

@@ -259 +259 @@
      
         dy[dy==0]=1
-        #idx = (x>=self.qmin) & (x <= self.qmax)
-  
+       
         # Compute theory data f(x)
-        #fx = numpy.zeros(len(x))
         tempy=[]
+        fx=numpy.zeros(len(y))
+        tempdy=[]
+        index=[]
         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)
+                    fx[i_x] =value
                     tempy.append(y[i_x])
                     tempdy.append(dy[i_x])
+                    index.append(i_x)
             except:
                 ## skip error for model.run(x)
@@ -280 +280 @@
         ## Smear theory data
         if self.smearer is not None:
-            tempfx = self.smearer(tempfx)
+            fx = self.smearer(fx)
+            
+        for i in index:
+            tempfx.append(fx[i])
+      
         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 (newy- newfx)/newdy