Changeset b64fa56 in sasview

Timestamp:

Apr 13, 2009 4:04:04 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:

b86c920

Parents:

37f487e

Message:

putting 1 to zero value on dy in fitting

File:

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

park_integration/AbstractFitEngine.py

@@ -174 +174 @@
         """
         return []
+    
+    
 class FitData1D(object):
     """ Wrapper class  for SANS data """
@@ -238 +240 @@
             @return residuals
         """
-        x,y,dy = [numpy.asarray(v) for v in (self.x,self.y,self.dy)]
-           
+        x,y = [numpy.asarray(v) for v in (self.x,self.y)]
+        if self.dy ==None or self.dy==[]:
+            dy= numpy.zeros(len(y))  
+        else:
+            dy= numpy.asarray(self.dy)
+        dy[dy==0]=1
         idx = (x>=self.qmin) & (x <= self.qmax)
   
@@ -309 +315 @@
         """
         res=[]
+        if self.err_image== None or self.err_image ==[]:
+            self.err_image= numpy.zeros(len(self.x_bins),len(self.y_bins))
+        self.err_image[self.err_image==0]=1
         
         for i in range(len(self.y_bins)):