Changeset 7d94915 in sasview

Timestamp:

Sep 14, 2016 9:41:14 AM (8 years ago)

Author:

krzywon

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:

a235f715, 3d164b9

Parents:

67cc2f7

git-author:

Jeff Krzywon <krzywon@…> (09/14/16 09:41:14)

git-committer:

Jeff KRzywon <krzywon@…> (09/14/16 09:41:14)

Message:

Fixes #658: ASCII reader files less than 5 lines long get thrown out.

Files:

• src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_ascii.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/ascii_reader.py

@@ -171 +171 @@
 
                 input_f.close()
+                if not is_data:
+                    return None
                 # Sanity check
                 if has_error_dy == True and not len(ty) == len(tdy):

test/sasdataloader/test/utest_ascii.py

@@ -94 +94 @@
         f = self.loader.load("ascii_test_6.txt")
         # The length of the data is 5
-        self.assertEqual(len(f.x), 4)
-        self.assertEqual(f.x[0],0.013534)
-        self.assertEqual(f.x[3],0.022254)
+        self.assertEqual(f, None)
         
 if __name__ == '__main__':