Changeset 189be4e in sasview for park_integration

Timestamp:

Jun 11, 2010 2:53:14 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1759c8e

Parents:

d0d7704

Message:

fixed fitting error on theory curve

File:

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

park_integration/AbstractFitEngine.py

@@ -162 +162 @@
             
         """
-        
         self.smearer = smearer
-        if dy ==None or dy==[]:
-            self.dy= numpy.zeros(len(self.y))  
+        
+        # Check error bar; if no error bar found, set it constant(=1)
+        # TODO: Should provide an option for users to set it like percent, constant, or dy data
+        if dy ==None or dy==[] or dy.all()==0:
+            self.dy= numpy.ones(len(y))  
         else:
-            self.dy= numpy.asarray(dy)
-     
-        # For fitting purposes, replace zero errors by 1 if all of them are zero
-        #TODO: check validity for the rare case where only
-        # all points have zero errors 
-        if self.dy.all()==0: self.dy = 1
-        
+            self.dy= numpy.asarray(dy).copy()
+
         ## Min Q-value
         #Skip the Q=0 point, especially when y(q=0)=None at x[0].
@@ -195 +192 @@
         """ to set the fit range"""
         # Skip Q=0 point, (especially for y(q=0)=None at x[0]).
-        #ToDo: Fix this.
+        # ToDo: Find better way to do it.
         if qmin==0.0 and not numpy.isfinite(self.y[qmin]):
             self.qmin = min(self.x[self.x!=0])
@@ -248 +245 @@
         if self.smearer is not None:
             fx = self.smearer(fx, self._first_unsmeared_bin, self._last_unsmeared_bin)
-       
+
         ## Sanity check
         if numpy.size(self.dy)!= numpy.size(fx):