Changeset dde2d44 in sasview

Timestamp:

Mar 26, 2010 6:37:42 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:

18e6c5e

Parents:

83ad478

Message:

fixed a problem in converting errors

File:

• DataLoader/manipulations.py (modified) (1 diff)

DataLoader/manipulations.py

@@ -81 +81 @@
 
     new_data = data2d.data.flatten()
-    new_err_data = data2d.err_data.flatten()
     qx_data = new_x.flatten()
     qy_data = new_y.flatten()
     q_data = numpy.sqrt(qx_data*qx_data+qy_data*qy_data)
+    if data2d.err_data == None or numpy.any(data2d.err_data<=0): 
+        new_err_data = numpy.sqrt(numpy.fabs(new_data))
+    else:
+        new_err_data = data2d.err_data.flatten()
     mask    = numpy.ones(len(new_data), dtype = bool)