Changeset d508be9 in sasview

Timestamp:

Apr 10, 2009 1:44:31 PM (16 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:

d0fd4c9

Parents:

88e289c

Message:

line with fewer/larger columns now considered as a header

File:

• DataLoader/readers/ascii_reader.py (modified) (8 diffs)

DataLoader/readers/ascii_reader.py

@@ -94 +94 @@
                 #Initialize counters for data lines and header lines.
                 is_data = False #Has more than 3 lines
-                mum_data_lines = 3 # More than "3" lines of data is considered as actual data unless there is only less lines of data
-
-                i=-1  # To count # of current data candidate lines
-                i1=-1 # To count total # of previous data candidate lines
-                j=-1  # To count # of header lines
-                j1=-1 # Helps to count # of header lines
+                mum_data_lines = 3 # More than "3" lines of data is considered as actual data unless that is the only data
+
+                i=-1            # To count # of current data candidate lines
+                i1=-1           # To count total # of previous data candidate lines
+                j=-1            # To count # of header lines
+                j1=-1           # Helps to count # of header lines
+                lentoks = 2     # minimum required number of columns of data; ( <= 4).
                 
                 for line in lines:
@@ -109 +110 @@
                         _y = float(toks[1])
                         
+                        #To reject the line when reader meets less columns of data
+                        if lentoks == 3:
+                            _dy = float(toks[2])
+                        elif lentoks == 4:
+                            _dx = float(toks[3])
+                        
                         #Reset the header line counters
                         if j == j1:
@@ -116 +123 @@
                         if i > 1:
                             is_data = True
-                            
+                        
                         if data_conv_q is not None:
                             _x = data_conv_q(_x, units=output.x_unit)
@@ -161 +168 @@
                             has_error_dx = False if _dx == None else True
                         
+                        #After talked with PB, we decided to take care of only 4 columns of data for now.
+                        #number of columns in the current line
+                        if len(toks)>= 4:
+                            new_lentoks = 4
+                        else:
+                            new_lentoks = len(toks)
+                        
+                        #If the previous columns are less than the current, mark the previous as non-data and reset the dependents.  
+                        if lentoks < new_lentoks :
+                            if is_data == False:
+                                i = -1
+                                i1 = 0
+                                j = -1
+                                j1 = -1
+                            
                         #Delete the previously stored lines of data candidates if is not data.
                         if i < 0 and -1< i1 < mum_data_lines and is_data == False:
@@ -219 +241 @@
                                     pass                                                                                                             
                             tdx = numpy.append(tdx, _dx)
+
+                        #reset i1 and flag lentoks for the next
+                        if lentoks < new_lentoks :
+                            if is_data == False:
+                                i1 = -1                            
+                        if len(toks)>= 4:
+                            lentoks = 4
+                        else:
+                            lentoks = len(toks)
                         
                         #Reset # of header lines and counts # of data candidate lines    
@@ -230 +261 @@
                         if is_data == True:
                             break    
+                        lentoks = 2
                         #Counting # of header lines                    
                         j+=1
@@ -265 +297 @@
                         dx[i] = tdx[ind[i]]
                 
+                
                 #Data    
                 output.x = x
@@ -279 +312 @@
                 else:
                     output.yaxis("\\rm{Intensity}","cm^{-1}")
-
+                print "output",output
                 return output