Changeset 59d542c in sasview for prview/perspectives/pr

Timestamp:

Apr 28, 2011 8:25:51 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:

b1a463a

Parents:

3831ea1e

Message:

fixed error bar changes

File:

• prview/perspectives/pr/pr.py (modified) (1 diff)

prview/perspectives/pr/pr.py

@@ -1162 +1162 @@
             load_error("The loaded file contains no data")
             return None
-        
+
         # If we have not errors, add statistical errors
-        if err is not None and y is not None:
-            err = numpy.zeros(len(y))
-            scale = None
-            min_err = 0.0
-            for i in range(len(y)):
-                # Scale the error so that we can fit over several decades of Q
-                if scale == None:
-                    scale = 0.05 * math.sqrt(y[i])
-                    min_err = 0.01 * y[i]
-                err[i] = scale * math.sqrt(math.fabs(y[i])) + min_err
-            message = "The loaded file had no error bars, "
-            message += "statistical errors are assumed."
-            wx.PostEvent(self.parent, StatusEvent(status=message))
+        if y is not None:
+            if err == None or numpy.all(err) == 0:
+                err = numpy.zeros(len(y))
+                scale = None
+                min_err = 0.0
+                for i in range(len(y)):
+                    # Scale the error so that we can fit over several decades of Q
+                    if scale == None:
+                        scale = 0.05 * math.sqrt(y[i])
+                        min_err = 0.01 * y[i]
+                    err[i] = scale * math.sqrt(math.fabs(y[i])) + min_err
+                message = "The loaded file had no error bars, "
+                message += "statistical errors are assumed."
+                wx.PostEvent(self.parent, StatusEvent(status=message))
         
         try: