Changeset 121c224 in sasview

Timestamp:

May 21, 2011 11:52:27 AM (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:

f2d9e76

Parents:

da96629

Message:

final fixes for dQ=0 and Q=0 points

Location:

DataLoader/readers

Files:

• abs_reader.py (modified) (1 diff)
• ascii_reader.py (modified) (1 diff)
• cansas_reader.py (modified) (1 diff)

DataLoader/readers/abs_reader.py

@@ -229 +229 @@
                 if len(x) == 0:
                     raise ValueError, "ascii_reader: could not load file"
-                output.x = x
-                output.y = y
-                output.dy = dy
-                output.dx = dx
+                
+                # Zeros in dx, dy 
+                if not numpy.all(dx==0):
+                    dx[dx==0] = _ZERO
+                if not numpy.all(dy==0):
+                    dy[dy==0] = _ZERO
+
+                output.x = x[x!=0]
+                output.y = y[x!=0]
+                output.dy = dy[x!=0]
+                output.dx = dx[x!=0]
                 if data_conv_q is not None:
                     output.xaxis("\\rm{Q}", output.x_unit)

DataLoader/readers/ascii_reader.py

@@ -330 +330 @@
                     dy[dy==0] = _ZERO
                 #Data    
-                output.x = x
-                output.y = y
-                output.dy = dy if has_error_dy == True else numpy.zeros(len(y))
-                output.dx = dx if has_error_dx == True else numpy.zeros(len(x))
+                output.x = x[x!=0]
+                output.y = y[x!=0]
+                output.dy = dy[x!=0] if has_error_dy == True else numpy.zeros(len(y))
+                output.dx = dx[x!=0] if has_error_dx == True else numpy.zeros(len(x))
                                 
                 if data_conv_q is not None:

DataLoader/readers/cansas_reader.py

@@ -555 +555 @@
                 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
-        data_info.dxw = dxw
+        if not numpy.all(dx==0):
+            dx[dx==0] = _ZERO
+        if not numpy.all(dy==0):
+            dy[dy==0] = _ZERO
+       
+        data_info.x = x[x!=0]
+        data_info.y = y[x!=0]
+        data_info.dx = dx[x!=0]
+        
+        data_info.dy = dy[x!=0]
+        data_info.dxl = dxl[x!=0]
+        data_info.dxw = dxw[x!=0]
         
         data_conv_q = None