Changeset 25a92d1 in sasview

Timestamp:

Dec 18, 2009 3:37:23 PM (15 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:

6e74ee4

Parents:

c8c4fa1

Message:

took care of dy when there's no dy data in fit function

File:

• Invariant/invariant.py (modified) (2 diffs)

Invariant/invariant.py

@@ -121 +121 @@
         power = power
         fx = numpy.zeros(len(self.data.x))
-        sigma = numpy.zeros(len(self.data.x))
+        one = numpy.ones(len(self.data.x))
 
         #define dy^2
-        sigma = self.data.dy[self.idx_unsmeared ]
+        try:
+            sigma = self.data.dy[self.idx_unsmeared ]
+        except:
+            print "The dy data for Invariant calculation should be prepared before get to FitFunctor.fit()..."
+            sigma = one[self.idx_unsmeared ]
         sigma2 = sigma*sigma
 
@@ -199 +203 @@
             raise ValueError,"Data must be of type DataLoader.Data1D"
         new_data = self._scale * data - self._background
-        new_data.dy = data.dy
-        new_data.dxl = data.dxl
-        new_data.dxw = data.dxw
+        try:
+            #All data should pass here.
+            new_data.dy = data.dy
+            new_data.dxl = data.dxl
+            new_data.dxw = data.dxw        
+        except:
+            #in case...
+            new_data.dy = numpy.ones(len(data.x))
+            new_data.dxl = numpy.zeros(len(data.x))
+            new_data.dxw = numpy.zeros(len(data.x))       
+
         return new_data