Changeset 272b107 in sasview for DataLoader/readers

Timestamp:

Apr 10, 2009 9:55:44 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:

3aed0eb

Parents:

249bae9

Message:

improved…

File:

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

DataLoader/readers/ascii_reader.py

@@ -111 +111 @@
                         
                         #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])
+                        #if lentoks == 3:
+                        #    _dy = float(toks[2])
+                        #elif lentoks == 4:
+                        #    _dx = float(toks[3])
                         
                         #Reset the header line counters
@@ -176 +176 @@
                         
                         #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:
+                        if lentoks != new_lentoks :
+                            if is_data == True:
+                                break
+                            else:
                                 i = -1
                                 i1 = 0
                                 j = -1
                                 j1 = -1
+                            
                             
                         #Delete the previously stored lines of data candidates if is not data.