Changeset 0e5e586 in sasview

Timestamp:

Jul 16, 2009 3:55:54 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:

d9dbb76

Parents:

b9d5f88

Message:

changed min. required # of lines (5 lines now) and enable to distinguish # of columns (even more than 4 col.)

File:

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

DataLoader/readers/ascii_reader.py

@@ -93 +93 @@
                 
                 #Initialize counters for data lines and header lines.
-                is_data = False #Has more than 3 lines
-                mum_data_lines = 10 # More than "3" lines of data is considered as actual data unless that is the only data
+                is_data = False #Has more than 5 lines
+                mum_data_lines = 5 # More than "5" lines of data is considered as actual data unless that is the only data
 
                 i=-1            # To count # of current data candidate lines
@@ -164 +164 @@
                         #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)
+                        #To remember the # of columns in the current line of data
+                        new_lentoks = len(toks)
                         
                         #If the previous columns not equal to the current, mark the previous as non-data and reset the dependents.  
@@ -243 +241 @@
                             if is_data == False:
                                 i1 = -1                            
-                        if len(toks)>= 4:
-                            lentoks = 4
-                        else:
-                            lentoks = len(toks)
+                        #To remember the # of columns on the current line for the next line of data
+                        lentoks = len(toks)
                         
                         #Reset # of header lines and counts # of data candidate lines