Changeset 78ecdcc in sasview for sansinvariant/src/sans

Timestamp:

Dec 8, 2011 6:06:33 PM (13 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:

6574940a

Parents:

26e1001

Message:

this fixed no_weigtht fit problem

File:

• sansinvariant/src/sans/invariant/invariant.py (modified) (2 diffs)

sansinvariant/src/sans/invariant/invariant.py

@@ -300 +300 @@
         # Uncertainty
         if type(self.data.dy)==numpy.ndarray and \
-            len(self.data.dy)==len(self.data.x):
+            len(self.data.dy)==len(self.data.x) and \
+            numpy.all(self.data.dy>0):
             sigma = self.data.dy
         else:
             sigma = numpy.ones(len(self.data.x))
-            
+
         # Compute theory data f(x)
         fx[idx] = self.data.y[idx]
@@ -330 +331 @@
                     numpy.ones(len(linearized_data.x))*b-linearized_data.y
             residuals = numpy.sum(deltas*deltas/sigma2)
-            
+
             err = math.fabs(residuals) / numpy.sum(1.0/sigma2)
             return [a, b], [0, math.sqrt(err)]