Changeset d2539aa in sasview for DataLoader

Timestamp:

Oct 20, 2010 6:50:20 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:

b2f25dc5

Parents:

fb59ed9

Message:

reset the value to zero if nan or inf

File:

• DataLoader/readers/red2d_reader.py (modified) (3 diffs)

DataLoader/readers/red2d_reader.py

@@ -24 +24 @@
 except:
     has_converter = False
-
+    
+def check_point(x_point):
+    """
+    check point validity
+    """
+    # set zero for non_floats
+    try:
+        return float(x_point)
+    except:
+        return 0
+        
 class Reader:
     """ Simple data reader for Igor data files """
@@ -185 +195 @@
             data_list = "\t".join(data_lines.tolist())
             data_list = data_list.split()
-            
+
         # Change it(string) into float
-        data_list = map(float,data_list)
+        #data_list = map(float,data_list)
+        data_list1 = map(check_point,data_list)
+      
         # numpy array form
-        data_array = numpy.array(data_list)
-
+        data_array = numpy.array(data_list1)
         # Redimesion based on the row_num and col_num, otherwise raise an error.
         try:
@@ -216 +227 @@
         # If all mask elements are False, put all True
         if not mask.any(): mask[mask==False] = True   
-  
+            
         # Store limits of the image in q space
         xmin    = numpy.min(qx_data)