Changeset da96629 in sasview for DataLoader

Timestamp:

May 21, 2011 1:18:32 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:

121c224

Parents:

1ab9dc1

Message:

taking care of zero errors

Location:

DataLoader/readers

Files:

• ascii_reader.py (modified) (2 diffs)
• cansas_reader.py (modified) (3 diffs)

DataLoader/readers/ascii_reader.py

@@ -23 +23 @@
 except:
     has_converter = False
+_ZERO = 1e-16
 
 class Reader:
@@ -323 +324 @@
                     if has_error_dx == True:
                         dx[i] = tdx[ind[i]]
+                # Zeros in dx, dy 
+                if has_error_dx:
+                    dx[dx==0] = _ZERO
+                if has_error_dy:
+                    dy[dy==0] = _ZERO
                 #Data    
                 output.x = x

DataLoader/readers/cansas_reader.py

@@ -38 +38 @@
 from lxml import etree
 import xml.dom.minidom
-
+_ZERO = 1e-16
 has_converter = True
 try:
@@ -554 +554 @@
                 dxl = numpy.append(dxl, _dxl)
                 dxw = numpy.append(dxw, _dxw)
+        # Zeros in dx, dy 
+        dx[dx==0] = _ZERO
+        dy[dy==0] = _ZERO
                 
         data_info.x = x
         data_info.y = y
         data_info.dx = dx
+        
         data_info.dy = dy
         data_info.dxl = dxl
@@ -583 +587 @@
         else:
             data_info.yaxis("\\rm{Intensity}","cm^{-1}")
-        
+
         return data_info