Changeset aac129aa in sasview for sansdataloader/src/sans/dataloader

Timestamp:

Jan 20, 2012 9:10:15 AM (13 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:

356d2d3

Parents:

e25d908

Message:

reverted taking x=0 point: need more careful thought

Location:

sansdataloader/src/sans/dataloader/readers

Files:

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

sansdataloader/src/sans/dataloader/readers/abs_reader.py

@@ -19 +19 @@
 except:
     has_converter = False
-_ZERO = 1e-16  
+    
 class Reader:
     """
@@ -229 +229 @@
                 if len(x) == 0:
                     raise ValueError, "ascii_reader: could not load file"
-                x[x==0] = _ZERO
-                y[x==0] = _ZERO
+                
                 output.x = x[x!=0]
                 output.y = y[x!=0]

sansdataloader/src/sans/dataloader/readers/ascii_reader.py

@@ -333 +333 @@
                     dy[dy==0] = _ZERO
                 #Data    
-                x[x==0] = _ZERO
-                y[x==0] = _ZERO
                 output.x = x[x!=0]
                 output.y = y[x!=0]

sansdataloader/src/sans/dataloader/readers/cansas_reader.py

@@ -559 +559 @@
         if not numpy.all(dy==0):
             dy[dy==0] = _ZERO
-        x[x==0] = _ZERO
-        y[x==0] = _ZERO
+       
         data_info.x = x[x!=0]
         data_info.y = y[x!=0]