Changeset 54c21f50 in sasview for park_integration

Timestamp:

Apr 16, 2009 2:23:52 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:

a8088d7

Parents:

3370922

Message:

deecopy of error data before computing residual

File:

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

park_integration/AbstractFitEngine.py

@@ -1 +1 @@
 
-import park,numpy,math
+import park,numpy,math, copy
 
 class SansParameter(park.Parameter):
@@ -244 +244 @@
             dy= numpy.zeros(len(y))  
         else:
-            dy= numpy.asarray(self.dy)
+            dy= copy.deepcopy(self.dy)
+            dy= numpy.asarray(dy)
         dy[dy==0]=1
         idx = (x>=self.qmin) & (x <= self.qmax)
@@ -316 +317 @@
         res=[]
         if self.err_image== None or self.err_image ==[]:
-            self.err_image= numpy.zeros(len(self.y_bins),len(self.x_bins))
-        self.err_image[self.err_image==0]=1
-        
+            err_image= numpy.zeros(len(self.y_bins),len(self.x_bins))
+        else:
+            err_image = copy.deepcopy(self.err_image)
+            
+        err_image[err_image==0]=1
         for i in range(len(self.x_bins)):
             for j in range(len(self.y_bins)):
@@ -325 +328 @@
                 if self.qmin <= radius and radius <= self.qmax:
                     res.append( (self.image[j][i]- fn([self.x_bins[i],self.y_bins[j]]))\
-                            /self.err_image[j][i] )
+                            /err_image[j][i] )
         
         return numpy.array(res)