Changeset b86c920 in sasview

Timestamp:

Apr 13, 2009 2:05:11 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:

60d6c23

Parents:

b64fa56

Message:

removing 1 on error loading is equal to zero

File:

• guiframe/data_loader.py (modified) (2 diffs)

guiframe/data_loader.py

@@ -105 +105 @@
         ## Creating a Data2D with output
         if hasattr(output,'data'):
-            temp = output.err_data
-            temp[temp==0]=1
-            msg= "Loading 2D error bars of value 1 were added to"
-            wx.PostEvent(parent, StatusEvent(status=" %s %s"% (msg,output.filename)))
-            new_plot = Data2D(image=output.data,err_image=temp,
+            
+            new_plot = Data2D(image=output.data,err_image=output.err_data,
                               xmin=output.xmin,xmax=output.xmax,
                               ymin=output.ymin,ymax=output.ymax)
@@ -120 +117 @@
             if output.dy ==None :
                 new_plot = Theory1D(output.x,output.y, dxl, dxw)
-                
-            elif len(output.dy[output.dy==0])==len(output.dy):
-                output.dy[output.dy==0]=1 
-                msg="Loading 1D error bars of value 1 were added to "
-                wx.PostEvent(parent, StatusEvent(status= "%s %s"%(msg, output.filename)))
-                new_plot = Theory1D(output.x,output.y,output.dy, dxl, dxw)
+        
             else:
                 msg="Loading 1D data: "